[Pkg-gnupg-commit] [gnupg2] 179/185: New upstream version 2.1.22
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Aug 7 11:55:37 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 8bc0972afd4439f4969f22818ec4955114dedec8
Merge: d2d4174 7d335ff
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Aug 7 00:02:16 2017 -0400
New upstream version 2.1.22
AUTHORS | 27 +-
COPYING.GPL2 | 339 +++
COPYING.LGPL21 | 509 ++++
COPYING.LIB => COPYING.LGPL3 | 0
ChangeLog | 1229 ++++++++++
Makefile.am | 3 +-
NEWS | 51 +-
README | 2 +-
VERSION | 2 +-
agent/agent.h | 26 +-
agent/call-pinentry.c | 14 +-
agent/command-ssh.c | 51 +-
agent/command.c | 33 +-
agent/divert-scd.c | 8 +-
agent/findkey.c | 135 +-
agent/genkey.c | 4 +-
agent/gpg-agent.c | 153 +-
agent/pksign.c | 155 +-
agent/preset-passphrase.c | 3 +-
agent/protect.c | 59 +-
build-aux/speedo.mk | 4 +-
build-aux/speedo/w32/g4wihelp.c | 5 +-
common/Makefile.am | 3 +-
common/argparse.c | 45 +-
common/argparse.h | 14 +-
common/compliance.c | 590 +++++
common/compliance.h | 88 +
common/homedir.c | 91 +-
common/logging.c | 3 +-
common/miscellaneous.c | 10 +
common/ssh-utils.c | 128 +-
common/ssh-utils.h | 6 +-
common/status-codes.h | 26 +-
common/status.h | 4 +
common/stringhelp.c | 36 +
common/stringhelp.h | 4 +
common/sysutils.c | 46 +
common/sysutils.h | 4 +-
common/t-ssh-utils.c | 103 +-
common/t-stringhelp.c | 76 +
common/util.h | 2 +
configure.ac | 7 +-
dirmngr/Makefile.am | 8 +-
dirmngr/dirmngr-client.c | 2 +-
dirmngr/dirmngr.c | 88 +-
dirmngr/dirmngr.h | 9 +
dirmngr/dirmngr_ldap.c | 2 +-
dirmngr/dns-stuff.c | 49 +-
dirmngr/dns.c | 288 ++-
dirmngr/http.c | 328 ++-
dirmngr/http.h | 5 +-
dirmngr/ks-action.c | 16 +-
dirmngr/ks-engine-finger.c | 2 +-
dirmngr/ks-engine-hkp.c | 272 ++-
dirmngr/ks-engine-http.c | 26 +
dirmngr/ldap.c | 1 +
dirmngr/loadswdb.c | 1 +
dirmngr/server.c | 42 +-
dirmngr/t-http.c | 31 +
doc/DETAILS | 33 +-
doc/Makefile.am | 10 +-
doc/defsincdate | 2 +-
doc/dirmngr.texi | 25 +-
doc/examples/vsnfd.prf | 2 +-
doc/gnupg.texi | 4 +-
doc/gpg-agent.texi | 7 +
doc/gpg.texi | 417 ++--
doc/gpgsm.texi | 7 +-
doc/tools.texi | 2 +
doc/wks.texi | 340 +++
doc/yat2m.c | 14 +-
g10/Makefile.am | 7 +-
g10/build-packet.c | 10 +-
g10/call-agent.c | 49 +-
g10/call-agent.h | 6 +-
g10/call-dirmngr.c | 30 +-
g10/call-dirmngr.h | 2 +-
g10/card-util.c | 51 +-
g10/cpr.c | 2 +-
g10/decrypt-data.c | 12 +
g10/encrypt.c | 69 +-
g10/export.c | 3 +-
g10/free-packet.c | 6 +
g10/getkey.c | 510 ++--
g10/gpg.c | 134 +-
g10/gpgcompose.c | 75 +-
g10/gpgv.c | 1 +
g10/import.c | 405 +++-
g10/key-check.c | 655 +++++
tools/send-mail.h => g10/key-check.h | 15 +-
g10/keydb.h | 34 +-
g10/keyedit.c | 803 ++-----
g10/keyedit.h | 60 +
g10/keygen.c | 7 +-
g10/keyid.c | 40 +-
g10/keylist.c | 62 +-
g10/keyserver-internal.h | 2 +-
g10/keyserver.c | 55 +-
g10/main.h | 32 +-
g10/mainproc.c | 73 +-
g10/misc.c | 106 -
g10/options.h | 13 +-
g10/packet.h | 10 +-
g10/parse-packet.c | 8 +-
g10/pkclist.c | 8 +-
g10/pubkey-enc.c | 25 +-
g10/sig-check.c | 21 +
g10/sign.c | 34 +-
g10/skclist.c | 16 +-
g10/sqrtu32.c | 244 --
g10/sqrtu32.h | 14 -
g10/tofu.c | 18 +-
kbx/kbxutil.c | 2 +-
po/ca.po | 2575 ++++++++++----------
po/cs.po | 2624 ++++++++++----------
po/da.po | 2616 ++++++++++----------
po/de.po | 2637 +++++++++++----------
po/el.po | 2575 ++++++++++----------
po/en at boldquot.po | 2549 ++++++++++----------
po/en at quot.po | 2549 ++++++++++----------
po/eo.po | 2568 ++++++++++----------
po/es.po | 2619 ++++++++++----------
po/et.po | 2573 ++++++++++----------
po/fi.po | 2576 ++++++++++----------
po/fr.po | 2621 ++++++++++----------
po/gl.po | 2573 ++++++++++----------
po/gnupg2.pot | 2533 ++++++++++----------
po/hu.po | 2575 ++++++++++----------
po/id.po | 2576 ++++++++++----------
po/it.po | 2573 ++++++++++----------
po/ja.po | 2595 ++++++++++----------
po/nb.po | 2611 ++++++++++----------
po/pl.po | 2623 ++++++++++----------
po/pt.po | 2572 ++++++++++----------
po/ro.po | 2600 ++++++++++----------
po/ru.po | 2613 ++++++++++----------
po/sk.po | 2575 ++++++++++----------
po/sv.po | 2615 ++++++++++----------
po/tr.po | 2615 ++++++++++----------
po/uk.po | 2618 ++++++++++----------
po/zh_CN.po | 2599 ++++++++++----------
po/zh_TW.po | 2608 ++++++++++----------
scd/app-openpgp.c | 94 +-
scd/ccid-driver.c | 30 +-
scd/scdaemon.c | 9 +-
sm/call-agent.c | 19 +
sm/decrypt.c | 53 +-
sm/encrypt.c | 54 +
sm/gpgsm.c | 56 +-
sm/gpgsm.h | 2 +
sm/keylist.c | 5 +-
sm/sign.c | 40 +
sm/verify.c | 42 +-
tests/fake-pinentries/README.txt | 2 +-
tests/gpgme/gpgme-defs.scm | 4 +-
tests/gpgscm/ffi.c | 2 +
tests/gpgscm/ffi.scm | 3 +-
tests/gpgscm/init.scm | 6 +-
tests/gpgscm/main.c | 19 +-
tests/gpgscm/repl.scm | 12 +
tests/gpgscm/scheme.c | 53 +-
tests/gpgscm/tests.scm | 128 +-
tests/gpgsm/gpgsm-defs.scm | 4 +-
tests/openpgp/Makefile.am | 3 +-
tests/openpgp/all-tests.scm | 22 +-
tests/openpgp/defs.scm | 10 +-
tests/openpgp/gpgv.scm | 75 +
tests/openpgp/shell.scm | 28 +-
tests/openpgp/{verify.scm => signed-messages.scm} | 72 -
tests/openpgp/ssh-export.scm | 4 +-
tests/openpgp/verify.scm | 268 +--
tools/call-dirmngr.c | 15 +-
tools/call-dirmngr.h | 15 +-
tools/gpg-check-pattern.c | 2 +-
tools/gpg-wks-client.c | 19 +-
tools/gpg-wks-server.c | 79 +-
tools/gpg-wks.h | 15 +-
tools/gpgconf-comp.c | 14 +-
tools/gpgconf.c | 3 +-
tools/gpgsplit.c | 4 +-
tools/mime-maker.c | 15 +-
tools/mime-maker.h | 15 +-
tools/mime-parser.c | 15 +-
tools/mime-parser.h | 15 +-
tools/rfc822parse.c | 20 +-
tools/rfc822parse.h | 18 +-
tools/send-mail.c | 15 +-
tools/send-mail.h | 15 +-
tools/symcryptrun.c | 2 +-
tools/wks-receive.c | 15 +-
tools/wks-util.c | 16 +-
191 files changed, 46435 insertions(+), 40027 deletions(-)
diff --cc ChangeLog
index 63269be,8bd68a6..0a9b2f1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,23059 -1,16 +1,24288 @@@
-No more ChangeLog files
-========================
++2017-07-28 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.22.
++ + commit 7d335ff496b129ee6f33c4ca25bd7a6631a4b590
+
+
++ po: Update German translation.
++ + commit 339f672dad94b4e0000fd2d3a1f272a4861c91c3
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++
++ agent: Make --ssh-fingerprint-digest re-readable.
++ + commit 6c9899bede6ecb2ccf7336d12724090f36a6aa3d
++ * agent/gpg-agent.c (main): Move oSSHFingerprintDigest to ...
++ (parse_rereadable_options): here.
++ (opts): Change its description.
++ (main) <aGPGConfList>: Include this option.
++ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add option at expert
++ level.
++
++ gpg,sm: String changes for compliance diagnostics.
++ + commit efe187e8a2b583defdcd9d4b96e3dc83f95bef0d
++
++
++ agent: For OCB key files return Bad Passprase instead of Checksum Error.
++ + commit 5cf95157c5db88dd599ac4d48f619782179b1438
++ * agent/protect.c (do_decryption): Map error checksum to bad
++ passpharse protection
++
++ * agent/call-pinentry.c (unlock_pinentry): Don't munge the error
++ source for corrupted protection.
++
++ gpg: Minor rework for better readibility of get_best_pubkey_byname.
++ + commit 1c35e29af95c46475f297d2bd70a5f3bd49d45b1
++ * g10/getkey.c (get_best_pubkey_byname): Change return type to
++ gpg_error_t. Use var name err instead of rc. Move a
++ gpg_error_from_syserror closer to the call.
++
++ gpg: Fix segv in get_best_pubkey_byname.
++ + commit 6496dc1f9d2aef3bf8cf950da2434c96f7a0145c
++ * g10/getkey.c (get_best_pubkey_byname): Init NEW.
++
++ agent: Minor cleanup (mostly for documentation).
++ + commit 5516ef47a22dfdf9cdf56107f34d2bda9e46deec
++ * agent/command.c (cmd_pksign): Change var name 'rc' to 'err'.
++ * agent/findkey.c (read_key_file): Ditto. Change return type to
++ gpg_error_t. On es_fessk failure return a correct error code.
++ (agent_key_from_file): Change var name 'rc' to 'err'.
++ * agent/pksign.c (agent_pksign_do): Ditto. Change return type to
++ gpg_error_t. Return a valid erro code on malloc failure.
++ (agent_pksign): Ditto. Change return type to gpg_error_t. replace
++ xmalloc by xtrymalloc.
++ * agent/protect.c (calculate_mic): Change return type to gpg_error_t.
++ (do_decryption): Ditto. Do not init RC.
++ (merge_lists): Change return type to gpg_error_t.
++ (agent_unprotect): Ditto.
++ (agent_get_shadow_info): Ditto.
++
++2017-07-27 Werner Koch <wk at gnupg.org>
++
++ gpg: Tweak compliance checking for verification.
++ + commit 6502bb0d2af5784918ebb74242fff6f0a72844bf
++ * common/compliance.c (gnupg_pk_is_allowed): Rework to always allow
++ verification.
++ * g10/mainproc.c (check_sig_and_print): Print a con-compliant warning.
++ * g10/sig-check.c (check_signature2): Use log_error instead of
++ log_info.
++
++ gpg,sm: Allow encryption (with warning) to any key in de-vs mode.
++ + commit 1bd22a85b4f06324037b3500d2fa8af62733c926
++ * g10/encrypt.c (encrypt_crypt): Do not abort for a non-compliant key.
++ * sm/encrypt.c (gpgsm_encrypt): Ditto.
++
++ gpg,sm: Fix compliance checking for decryption.
++ + commit a0d0cbee7654ad7582400efaa92d493cd8e669e9
++ * common/compliance.c (gnupg_pk_is_compliant): Remove the Elgamal
++ signing check. We don't support Elgamal signing at all.
++ (gnupg_pk_is_allowed) <de-vs>: Revert encryption/decryption for RSA.
++ Check the curvenames for ECDH.
++ * g10/pubkey-enc.c (get_session_key): Print only a warning if the key
++ is not compliant.
++ * sm/decrypt.c (gpgsm_decrypt): Ditto. Use the same string as in gpg
++ so that we have only one translation.
++
++ gpg: Avoid output to the tty during import.
++ + commit fcb62fe20f45290bf95703ec3bf4d0b361fa4339
++ * g10/key-check.c (key_check_all_keysigs): Add arg mode and change all
++ output calls to use it.
++ * g10/keyedit.c (keyedit_print_one_sig): Add arg fp and chnage all
++ output calls to use it.
++ (keyedit_menu): Adjust for changes.
++ * g10/gpgcompose.c (keyedit_print_one_sig): Add dummy arg fp.
++ * g10/import.c (import_one): Call key_check_all_keysigs with output to
++ the log stream.
++
++2017-07-26 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ g10: Make sure exactly one fingerprint is output with --quick-gen-key.
++ + commit 94eea0ed2c8b47cb0fe02b22cbe668705a5fe0d0
++ * g10/keygen.c (do_generate_keypair): Only set fpr in
++ list_keyblock_direct invocation if neither --fingerprint nor
++ --with-fingerprints are given.
++
++2017-07-26 Werner Koch <wk at gnupg.org>
++
++ doc: Add man pages form gpg-wks-server and gpg-wks-client.
++ + commit be636c3cfca178927b09ef4154c3e555d6f5b1c4
++ * doc/wks.texi: New.
++ * doc/gnupg.texi: Include wks.texi.
++ * doc/Makefile.am (gnupg_TEXINFOS): Add wks.texi.
++ (myman_pages): Add new man pages.
++
++ wks: Fix program names in the usage diagnostics.
++ + commit c76398da5b15df2086f68bc26b7fde75219976c7
++ * tools/gpg-wks-client.c (my_strusage): Add case 12.
++ * tools/gpg-wks-server.c (my_strusage): Add case 12:
++
++2017-07-26 Andre Heinecke <aheinecke at intevation.de>
++
++ doc: Update vsnfd profile example.
++ + commit 4f569c69075fddbaea588544a6625c28cb4cb8f4
++ * doc/examples/vsnfd.prf: Use rsa3072
++
++2017-07-26 Werner Koch <wk at gnupg.org>
++
++ dirmngr: Do not use a blocking connect in Tor mode.
++ + commit c5e5748480952e5bcedb16f6ce6ef7e435acb3c7
++ * dirmngr/http.c (http_raw_connect): Disable the timeout in Tor mode.
++ (send_request): Ditto.
++
++ dirmngr: Auto-enable Tor on startup or reload.
++ + commit fd68bdb61ec4f8441da6d3023a8da4315df54cec
++ * dirmngr/dirmngr.c (dirmngr_use_tor): Test for Tor availibility.
++
++ agent,dirmngr: Check for homedir removal also using stat(2).
++ + commit d50c2eff8d6931586c527edb3dea98dbc6facdec
++ * agent/gpg-agent.c (have_homedir_inotify): New var.
++ (reliable_homedir_inotify): New var.
++ (main): Set reliable_homedir_inotify.
++ (handle_tick): Call stat on the homedir.
++ (handle_connections): Mark availibility of the inotify watch.
++ * dirmngr/dirmngr.c (handle_tick): Call stat on the homedir.
++ (TIMERTICK_INTERVAL_SHUTDOWN): New.
++ (handle_connections): Depend tick interval on the shutdown state.
++
++ agent: Lengthen timertick interval on Unix to 4 seconds.
++ + commit f4ec7697a9c2d7587794d3bd75efbb0b51d6562f
++ * agent/gpg-agent.c (TIMERTICK_INTERVAL): Same value for Windows and
++ Unix.
++
++2017-07-25 Werner Koch <wk at gnupg.org>
++
++ common: Strip trailing slashes from the homedir.
++ + commit 24c7aa0d58e3768690dd8ebef0e8e01af7e80f83
++ * common/homedir.c (default_homedir): Strip trailing slashes.
++ (gnupg_set_homedir): Ditto.
++
++ w32: Also change the directory on daemon startup.
++ + commit 0ef50340ef68b2541d9a1aafa71f5400aef4dc7e
++ * agent/gpg-agent.c (main): Always to the chdir.
++ * dirmngr/dirmngr.c (main): Ditto.
++ * scd/scdaemon.c (main): Ditto.
++
++ common: New functions gnupg_daemon_rootdir and gnupg_chdir.
++ + commit 226f143ca01cf335c7c4e3e94c96fb9d271eccc9
++ * common/sysutils.c (gnupg_chdir): New.
++ * common/homedir.c (gnupg_daemon_rootdir): New.
++ * agent/gpg-agent.c (main): Use these functions instead chdir("/").
++ * dirmngr/dirmngr.c (main): Ditto.
++ * scd/scdaemon.c (main): Ditto.
++
++ gpg: Update key origin info during import merge.
++ + commit 166d0d7a2439f30c0a250faadc16ce3453447d71
++ * g10/import.c (update_key_origin): New.
++ (merge_blocks): Add arg curtime.
++ (import_one): Pass curtime to merge_blocks. Call update_key_origin.
++
++ gpg: Store key origin for new userids during import merge.
++ + commit 84c993d9325fc000acac7950b2dfeefa5976df3b
++ * g10/import.c (apply_meta_data): Rename to ...
++ (insert_key_origin): this. Factor code out to ...
++ (insert_key_origin_pk, insert_key_origin_uid): new funcs.
++ (import_one): Move insert_key_origin behind clean_key.
++ (merge_blocks): Add args options, origin, and url.
++ (append_uid): Rename to ...
++ (append_new_uid): this. Add args options, curtime, origin, and url.
++ Call insert_key_origin_uid for new UIDs.
++
++2017-07-25 NIIBE Yutaka <gniibe at fsij.org>
++
++ dirmngr: Add annotation for fallthrough.
++ + commit d40b4a41a8d60292fd4b5b951a19883e31090179
++ * dirmngr/dns.c: Add /* FALL THROUGH */ to clarify.
++
++2017-07-24 Werner Koch <wk at gnupg.org>
++
++ gpg: Extend --key-origin to take an optional URL arg.
++ + commit 87b5421ca84bbea68217c9ed771ee8c0a98a4d0c
++ * g10/getkey.c (parse_key_origin): Parse appended URL.
++ * g10/options.h (struct opt): Add field 'key_origin_url'.
++ * g10/gpg.c (main) <aImport>: Pass that option to import_keys.
++ * g10/import.c (apply_meta_data): Extend for file and url.
++ * g10/keyserver.c (keyserver_fetch): Pass the url to
++ import_keys_es_stream.
++
++ gpg: Store key origin info for new keys from a keyserver.
++ + commit 2ca0381d077d766593db26f4215b8eddee8d7963
++ * g10/keyserver.c (keyserver_get_chunk): Use KEYORG_KS if request was
++ done by fingerprint.
++ * g10/import.c (apply_meta_data): Implement that.
++
++ gpg: Store key origin info for new DANE and WKD retrieved keys.
++ + commit e7068bf92ec5ca5d440346d43a382c1f625b924d
++ * g10/import.c (apply_meta_data): Remove arg 'merge'. Add arg 'url'.
++ Implement WKD and DANE key origin.
++ (import_keys_internal): Add arg 'url' and change all callers.
++ (import_keys_es_stream): Ditto.
++ (import): Ditto.
++ (import_one): Ditto.
++ * g10/keylist.c (list_keyblock_print): Fix update URL printing.
++ * g10/call-dirmngr.c (gpg_dirmngr_wkd_get): Add arg 'r_url' to return
++ the SOURCE. Pass ks_status_cb to assuan_transact.
++ * g10/keyserver.c (keyserver_import_wkd): Get that URL and pass it to
++ the import function.
++
++ gpg: Filter keys received via DANE.
++ + commit f6f0dd4d5ea85e0b16e96d7678b1d508182049a8
++ * g10/keyserver.c (keyserver_import_cert): Use an import filter in
++ DANE mode.
++
++ dirmngr: Print a SOURCE status for WKD requests.
++ + commit e97548223948222a5c22acdf3775c7f93c1e17a9
++ * dirmngr/server.c (cmd_wkd_get): Print a SOURCE status.
++
++ dirmngr: New function dirmngr_status_printf.
++ + commit 9b88cfa0962f28894658cff8777fe7a217c6f700
++ * dirmngr/server.c (dirmngr_status_printf): New.
++
++2017-07-24 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ g10: Make sure to emit NEED_PASSPHRASE on --import of secret key.
++ + commit 872137b5921dd297e7d2c1def6e3868b7595feb5
++ * call-agent.h (agent_import_key): Add keyid parameters.
++ * call-agent.c (agent_import_key): Set keyid parameters.
++ * import.c (transfer_secret_keys): Pass keyid parameters.
++
++ w32: Change directory on daemon startup.
++ + commit 78ebc62604d77600b9865950610717d28c6027a2
++ * agent/gpg-agent.c [HAVE_W32_SYSTEM]: Include <direct.h>.
++ (main) [HAVE_W32_SYSTEM]: Change working directory to \.
++ * dirmngr/dirmngr.c [HAVE_W32_SYSTEM]: Include <direct.h>.
++ (main) [HAVE_W32_SYSTEM]: Change working directory to \.
++ * scd/scdaemon.c [HAVE_W32_SYSTEM]: Include <direct.h>.
++ (main) [HAVE_W32_SYSTEM]: Change working directory to \.
++
++ g10: Make sure to emit NEED_PASSPHRASE on --export-secret-key.
++ + commit d8e46f10698da0bee4cd58d95f1f9832bdda0c5f
++ * call-agent.h (agent_export_key): Add keyid parameters.
++ * call-agent.c (agent_export_key): Set keyid parameters.
++ * export.c (receive_seckey_from_agent): Pass keyid parameters.
++
++2017-07-24 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Use unsigned int for fields.
++ + commit 45e40487fb7bb51228c96c8966e38c643a9b9ba5
++ * scd/app-openpgp.c (data_objects): Use unsigned ints.
++
++ dirmngr: More minor fix.
++ + commit ade4b2744c848e07b87afa4f186256c2a2ef1d13
++ * dirmngr/http.c (send_request): Care the case of !USE_TLS.
++
++ dirmngr: More minor fixes.
++ + commit 789401e9557db13422f47a8c09e693f3cee0132b
++ * dirmngr/http.c (http_verify_server_credentials): Duplicated const.
++ * dirmngr/ldap.c (parse_one_pattern): Add comment.
++
++ dirmngr: Minor fix for Windows.
++ + commit 274602820cfbb15c7cdb4525acd9793bdb472e78
++ * dirmngr/http.c (connect_with_timeout): Use FD2INT.
++
++ agent: Minor fix for Windows.
++ + commit 328fca187253c069e3630bd387a71f6d16e9820a
++ * agent/command-ssh.c (serve_mmapped_ssh_request): Add const
++ qualifier.
++
++2017-07-21 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ g10: Avoid caching passphrase for failed symmetric encryption.
++ + commit e4c720fa3b31ebd3e9d764c6eab02729cf06124c
++ * g10/mainproc.c (proc_encrypted): If error code is GPG_ERR_CIPHER_ALGO,
++ assume the symmetric passphrase was wrong and invalidate the cache.
++
++2017-07-21 Werner Koch <wk at gnupg.org>
++
++ gpg: Extend --quick-set-expire to allow subkey expiration setting.
++ + commit b55b72bb815ad5870456b89c3a011fa00991b4a8
++ * g10/keyedit.c (keyedit_quick_set_expire): Add new arg subkeyfprs.
++ (menu_expire): Rename arg force_mainkey to unattended and allow
++ unattended changing of subkey expiration.
++ * g10/gpg.c (main): Extend --quick-set-expire.
++
++ gpg: Fix possible double free of the card serialno.
++ + commit e888f7af6571ecd3994fd55cc18c9e2df7fd0c60
++ * g10/free-packet.c (copy_public_key): Copy fields serialno and
++ updateurl.
++
++ gpg: Use macros to check the signature class.
++ + commit 5818ff0ae314af08548fcc23df2b807736144a00
++ * g10/import.c: Use the extistin macros for better readability.
++
++2017-07-21 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ g10: Clean keyblock on initial commit.
++ + commit 609bbdf3614fbadeba7a6cbdfdf5004b23516a64
++ * g10/import.c (import_one): If option import-clean is set,
++ also clean on initial import, not only for merge.
++
++2017-07-21 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Fix SEGV in CCID driver.
++ + commit d8a55da715ce8447b0686f321fa43d00be34a467
++ * scd/ccid-driver.c (intr_cb): Only kick the loop for removal.
++ (bulk_in): Don't set POWERED_OFF when interrupt transfer is enabled.
++
++ g10: Don't limit at the frontend side for card capability.
++ + commit a76b6cf9709c0a2a89fa2887075491b80f3d9608
++ * g10/card-util.c (MAX_GET_DATA_FROM_FILE): New.
++ (get_data_from_file): Use MAX_GET_DATA_FROM_FILE.
++ (change_url, change_login, change_private_do): Don't limit.
++
++ scd: Add debug message for v3 card.
++ + commit 892e86b0dc69193ddff018bf9b3938509dd72cb3
++ * scd/app-openpgp.c (show_caps): Output more messages.
++
++2017-07-20 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ doc: Clarify wording of export-attributes.
++ + commit cea4313644b531ef87b8c8e4bfddde4388cbbe0d
++ * doc/gpg.texi: Clarify wording of export-attributes.
++
++2017-07-20 Werner Koch <wk at gnupg.org>
++
++ gpg: New option --with-key-origin.
++ + commit 165cdd8121bbf80bfe2da071539d3578630f198f
++ * g10/getkey.c (parse_key_origin): Factor list out as ...
++ (key_origin_list): new struct.
++ (key_origin_string): New.
++ * g10/gpg.c (oWithKeyOrigin): New const.
++ (opts): New option --with-key-origin.
++ (main): Implement option.
++ * g10/options.h (struct opt): New flag with_key_origin.
++ * g10/keylist.c (list_keyblock_print): Print key origin info.
++ (list_keyblock_colon): Ditto.
++
++ common: New function print_utf9_string.
++ + commit bddc2e04f1ddc18be20efc0f0508be401b345f42
++ * common/miscellaneous.c (print_utf8_string): New.
++
++ gpg: Make function mk_datestr public.
++ + commit 3ee314dde16d1d69ddf840cdb8b5aa186c592262
++ * g10/keydb.h (MK_DATESTR_SIZE): New.
++ * g10/keyid.c (mk_datestr): Make public. Add arg bufsize and use
++ snprintf. Change arg atime to u32.
++ (datestr_from_pk): Simplify.
++ (datestr_from_sig): Ditto.
++ (expirestr_from_pk): Ditto.
++ (expirestr_from_sig): Ditto.
++ (revokestr_from_pk): Ditto.
++
++2017-07-20 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ g10: Return proper error when gpg-agent fails to start during probe.
++ + commit 9998b162b47931fb8a8ed961d53418d505358888
++ * g10/getkey.c (lookup): Return immediately on any other error than
++ GPG_ERR_NO_SECKEY from agent_probe_any_secret_key.
++
++2017-07-20 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Support longer data length for special DOs for v3 card.
++ + commit 69614d55018ddb8678d8904a52e648931f480d72
++ * scd/app-openpgp.c (data_objects): Special DOs like "Login Data",
++ "URL", "Private DO N" can be longer size >= 256.
++ (struct app_local_s): Define bits for v3 card.
++ (get_cached_data): Use extcap.max_special_do for special DOs.
++ (app_select_openpgp): Detect if extcap_v3, kdf_do, and other bits.
++
++ common: logstream fix.
++ + commit 84146b3ec44943f06c66a603de19094b930ad446
++ * common/logging.c (set_file_fd): Don't close es_stderr.
++
++ dnsmngr: Fix use of CPP.
++ + commit cc12cf386b620e658fa93a0bd40477bc16d85d98
++ * dirmngr/dns.c (HAVE_STATIC_ASSERT, HAVE___ATOMIC_FETCH_ADD)
++ (DNS_HAVE_SOCKADDR_UN, HAVE_SOCK_NONBLOCK): Don't use defined
++ to be expanded for expression evaluation.
++
++2017-07-19 Justus Winter <justus at g10code.com>
++
++ dirmngr: Forbid redirects from .onion to clearnet URIs.
++ + commit e7fc6e3bf0eb6ffe53e1f099d28ce45cef4a8a87
++ * dirmngr/ks-engine-hkp.c (send_request): Forbid redirects from .onion
++ to clearnet URIs.
++ * dirmngr/ks-engine-http.c (ks_http_fetch): Likewise.
++
++2017-07-19 Werner Koch <wk at gnupg.org>
++
++ gpg: Avoid asking by fpr and then by keyid during auto-key-retrieve.
++ + commit 2e5459457473eb4b3e7b2b14815cb94faa66e8bb
++ * g10/mainproc.c (check_sig_and_print): Track key server request via
++ fingerprint.
++
++2017-07-19 Justus Winter <justus at g10code.com>
++
++ dirmngr: Implement TLS over http proxies.
++ + commit da91d2106a17c796ddb066a34db92d33b21c81f7
++ * dirmngr/http.c (send_request): If a http proxy is to be used, and we
++ want to use TLS, try to use the CONNECT method to get a connection to
++ the target server.
++
++ dirmngr: Log http response in debug mode.
++ + commit e7eabe66b6409c1f5225b751ea5c2d456a3856e6
++ * dirmngr/http.c (parse_response): Log http response in debug mode.
++
++ dirmngr: Amend TLS handling.
++ + commit 1ba220e68149fdb197accf4a15b0a11126c8b431
++ * dirmngr/http.c (http_wait_response): Get the 'use_tls' flag from the
++ write cookie, not from the URI.
++
++ dirmngr: Fix connecting to http proxies.
++ + commit 46a4a0c0e77e19f9589088bb87357c33142c3f04
++ * dirmngr/http.c (send_request): Do not use the 'srvtag' intended for
++ the target host to connect to the http proxy.
++
++ dirmngr: Fix handling of proxy URIs.
++ + commit 73d4781e4595634548269bafe46aeb7674c5b219
++ * dirmngr/http.c (send_request): We do not support socks4.
++
++2017-07-19 NIIBE Yutaka <gniibe at fsij.org>
++
++ gpgconf: Make vars read-only explicitly.
++ + commit 99791184ac4c7486ccdefc150b9921cd923428b9
++ * tools/gpgconf-comp.c (gc_backend, gc_arg_type, gc_level, gc_flag)
++ (gc_component): Add const qualifier.
++
++ Fix usage of ARGPARSE_OPTS.
++ + commit fa63db89f9581186ed758c502d4e69914b774157
++ * agent/gpg-agent.c, agent/preset-passphrase.c,
++ dirmngr/dirmngr-client.c, dirmngr/dirmngr_ldap.c, kbx/kbxutil.c,
++ tools/gpg-check-pattern.c, tools/gpgconf.c, tools/gpgsplit.c,
++ tools/symcryptrun.c: Use ARGPARSE_end.
++
++2017-07-18 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ common: Allow abbreviations of standard options.
++ + commit f17862d47d184d7f6ef883778cf63801365599a0
++ * argparse.h (ARGPARSE_SHORTOPT_HELP, ARGPARSE_SHORTOPT_VERSION,
++ ARGPARSE_SHORTOPT_WARRANTY, ARGPARSE_SHORTOPT_DUMP_OPTIONS): New
++ macros.
++ (ARGPARSE_end): Add some placeholders for standard options.
++ * argparse.c (arg_parse): Fill in missing standard options so
++ default machinery works. Check for standard options in new way.
++ Do not write out standard options for --dump-options.
++
++2017-07-18 Justus Winter <justus at g10code.com>
++
++ gpgscm,w32: Fix testing for absolute paths.
++ + commit 2e1342b78b020f5b28359b08a4f63cf11479602f
++ * tests/gpgscm/main.c (path_absolute_p): New function.
++ (load): Use new function.
++
++ dirmngr: Honor http keyserver URLs.
++ + commit b231959728a0056094134e0fca8cc916c24ef37e
++ * dirmngr/http.c (parse_uri): Keep an unmodified copy of the URI.
++ * dirmngr/http.h (struct parsed_uri_s): New field 'original'.
++ * dirmngr/ks-action.c (ks_action_get): Properly handle http and https
++ URLs.
++
++ dirmngr: Fix memory leak.
++ + commit ebb35ed7110d1a29061dfb4ccb9038645b20d7f4
++ * dirmngr/http.c (parse_uri): Properly free partial results.
++
++ dirmngr: Fix memory leak.
++ + commit 3d670fa973a03ea88b5f9459b3222a951136dd7a
++ * dirmngr/http.c (http_release_parsed_uri): Free 'params'.
++
++2017-07-17 Werner Koch <wk at gnupg.org>
++
++ gpg,sm: Check compliance of the RNG.
++ + commit a149afe338d61d86985c533cde5e7dbcd31e8698
++ * common/compliance.c (gnupg_rng_is_compliant): New.
++ * g10/call-agent.c (start_agent) [W32]: Check rng compliance.
++ * sm/call-agent.c (start_agent) [W32]: Ditto.
++ * g10/encrypt.c (encrypt_simple, encrypt_crypt): Check that the RNG is
++ compliant.
++ * sm/encrypt.c (gpgsm_encrypt): Ditto.
++ * g10/sign.c (do_sign): Ditto.
++ * sm/sign.c (gpgsm_sign): Ditto.
++
++ agent: New GETINFO sub-command jent_active.
++ + commit bbbd0db34b4e387f8dc089fb7d69fdcf2ed91a01
++ * agent/command.c (cmd_getinfo): Implement it for gcrypt >= 1.8.
++
++ common: New function split_fields_colon.
++ + commit 849467870ee1c10e0a7b1e89cfc9e8214e4963fe
++ * common/stringhelp.c (split_fields_colon): New.
++ * common/t-stringhelp.c (test_split_fields_colon): New test.
++ (main): Call that test.
++
++2017-07-14 Justus Winter <justus at g10code.com>
++
++ tests: Improve 'shell.scm' script.
++ + commit 58eafd11ed5501c0b72fcb553eb3e097ad29b3c6
++ * tests/openpgp/defs.scm (create-file): Unlink file first.
++ * tests/openpgp/shell.scm: Ask whether to import legacy test keys or
++ not, and whether to drop 'batch' from the configuration. Add paths to
++ all the programs to 'PATH'.
++
++ gpgscm: Library improvements.
++ + commit b4d25082fd4502ec01d511c22fecd60d513b81f4
++ * tests/gpgscm/repl.scm (prompt-yes-no?): New function.
++ * tests/gpgscm/tests.scm (pathsep-split): Likewise.
++ (pathsep-join): Likewise.
++ (with-path): Use the new function.
++
++ gpgscm: Fail early if the test setup fails.
++ + commit 7a6e6ad2880bbff54a75ff608d0ec97d6c405733
++ * tests/gpgscm/tests.scm (make-environment-cache): Check status code
++ of setup script.
++
++ gpg: Fix importing keys.
++ + commit 956da89193370d5aa970cff5b77f605534481a02
++ * g10/import.c (import_one): Fix error handling.
++
++2017-07-13 Werner Koch <wk at gnupg.org>
++
++ gpg: Pass key origin values to import functions.
++ + commit 330212efb927c119bb5135856f8582c0e4e2e6b7
++ * g10/import.c (import_keys_stream): Remove this unused function.
++ (import_keys_internal): Add arg origin.
++ (import_keys): Ditto.
++ (import_keys_es_stream): Ditto.
++ (import): Ditto.
++ (import_one): Ditto.
++ (apply_meta_data): New stub.
++ (import_secret_one): Pass 0 for ORIGIN.
++ * g10/keyserver.c (keyserver_get_chunk): For now pass 0 for ORIGIN.
++ (keyserver_fetch): Add arg origin.
++ (keyserver_import_cert): Pass KEYORG_DANE for ORIGIN.
++ (keyserver_import_wkd): Pass KEYORG_WKD for ORIGIN.
++ * g10/gpg.c (main): Pass OPT.KEY_ORIGIN to import_keys and
++ keyserver_fetch.
++ * g10/card-util.c (fetch_url): Pass KEYORG_URL for ORIGIN.
++
++ gpg: New option --key-origin.
++ + commit fa1155e89ebb4b16ee95549b8ab72672df3a0c54
++ * g10/keydb.h (KEYORG_): Rename to KEYORG_.
++ * g10/packet.h (PKT_user_id): Rename field keysrc to keyorg. Adjust
++ users.
++ (PKT_public_key): Ditto.
++ (PKT_ring_trust): Ditto.
++ * g10/options.h (struct opt): Add field key_origin.
++ * g10/getkey.c (parse_key_origin): New.
++ * g10/gpg.c (oKeyOrigin): New.
++ (opts): Add "keys-origin".
++ (main): Set option.
++
++2017-07-13 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ doc: Document gnupg version requirement for gpg-preset-passphrase.
++ + commit 877a321d011deb3e8501aa9cc5e9f9cd0b19dddf
++
++
++2017-07-13 Justus Winter <justus at g10code.com>
++
++ gpgscm: Make loading of modules less verbose.
++ + commit f78fe1a4ec9d343199e1f424dd09e2937c913412
++ * tests/gpgscm/main.c (load): Increase logging threshold.
++
++ gpgscm: Make it impossible to catch '*interpreter-exit*'.
++ + commit bce02a8b0f0e51775a4ee5536ccf35efc1f15ca6
++ * tests/gpgscm/init.scm (throw'): Make it impossible to catch
++ '*interpreter-exit*'. This fixes 'exit' (and with it 'fail') inside
++ 'catch' statements.
++
++2017-07-10 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ tofu: Compare squares instead of square roots.
++ + commit d24594976686983c7186cbe4e78153888a13b6e4
++ * g10/Makefile.am (tofu_source) [USE_TOFU]: Remove sqrtu32.h and
++ sqrtu32.c.
++ * g10/sqrtu32.h, g10/sqrtu32.c: Removed files.
++ * g10/tofu.c: Compare squares instead of square roots.
++
++ speedo: Provide a vagrantfile to test speedo in an isolated VM.
++ + commit 1455b406e63dd262938e49da5f83c05c17c60a8d
++ * build-aux/Vagrantfile: New file.
++
++2017-07-06 Neal H. Walfield <neal at g10code.com>
++
++ doc: Improve TOFU documentation.
++ + commit 243b2a570c30586e19b8c88e43b282d62d8eb77c
++ * doc/gpg.texi: Improve TOFU documentation.
++
++2017-07-05 Werner Koch <wk at gnupg.org>
++
++ agent: Use MAX_PASSPHRASE_LEN (255) also for the loopback.
++ + commit 3681ee7dc1e9d8c94fdb046d7be0bbcfeba1cfe9
++ * agent/call-pinentry.c (agent_get_passphrase): Reduce maximum
++ passphrase length as conveyed to the loopback to MAX_PASSPHRASE_LEN.
++ * agent/genkey.c (agent_ask_new_passphrase): Extend the maximum
++ passphrase as conveyed to the loopback to MAX_PASSPHRASE_LEN.
++
++ doc: Update yat2m to take care of SOURCE_DATE_EPOCH.
++ + commit 139de02b93773615bdd95e04a7f0c1ad73b4f6fb
++ * doc/yat2m.c (main): Set a default for OPT_DATE.
++
++ doc: Prefer an installed version of yat2m.
++ + commit f6faa058749846de18cb34f1cc79867bb0029922
++ * configure.ac (YAT2M): Check for tool.
++ * doc/Makefile.am (yat2m-stamp): Use installed tool if possible.
++
++2017-07-01 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
++
++ doc: Document obsolete option in gpgsm. Closes T2231.
++ + commit 7fb724c61655c6f75c61572d65a46e21ae112574
++ * doc/gpgsm.texi: Mark --prefer-system-dirmngr as obsolete.
++
++2017-06-28 Werner Koch <wk at gnupg.org>
++
++ agent: Fix option --debug-wait.
++ + commit ecd6c0160f49ae83001dfd150df6b1238fc479d5
++ * agent/gpg-agent.c (opts): Typo fix.
++
++2017-06-26 Justus Winter <justus at g10code.com>
++
++ agent: Support unprotected ssh keys.
++ + commit 273964798592cd479c111f47e8ce46d5b1999d6a
++ * agent/command-ssh.c (ssh_key_to_protected_buffer): If the empty
++ passphrase is supplied, do not protect the key.
++
++ tests: Improve test.
++ + commit b49b1a87ac2695e3892fb001878da59fbc92fa37
++ * tests/openpgp/ssh-export.scm: Split output at any whitespace.
++
++2017-06-23 Werner Koch <wk at gnupg.org>
++
++ agent: Shutdown on removal of the home directory.
++ + commit 1ead1ca818bddabc3bca22c195be667993eb3e2e
++ * common/sysutils.c (gnupg_inotify_watch_delete_self): New.
++ * agent/gpg-agent.c (handle_connections): Rename my_inotify_fd to
++ sock_inotify_fd.
++ (handle_connections): Add home_inotify_fd to watch the home directory.
++
++ build: Add missing LIBASSUAN_CFLAGS to dirmngr/.
++ + commit 815ecdf08a4285c75892cf9ab72feb13f3bcf590
++ * dirmngr/Makefile.am (t_http_CFLAGS): Add LIBASSUAN_CFLAGS.
++ (t_ldap_parse_uri_CFLAGS): Ditto.
++ (t_dns_stuff_CFLAGS): Ditto.
++
++ gpg,gpgsm: Emit status code ENCRYPTION_COMPLIANCE_MODE.
++ + commit f31dc2540acf7cd7f09fd94658e815822222bfcb
++ * common/status.h (STATUS_ENCRYPTION_COMPLIANCE_MODE): New.
++ * g10/encrypt.c (encrypt_crypt): Emit new status code.
++ * sm/encrypt.c (gpgsm_encrypt): Ditto.
++
++2017-06-21 Justus Winter <justus at g10code.com>
++
++ gpg: Close cached keydb handle in gpgv.
++ + commit a68a98233ab83f0c7b90e6e588b882085fe59d91
++ * g10/gpgv.c (main): Close cached handle.
++
++ tests: Add test for gpgv.
++ + commit 62274d3c309d8948405c2f966bef507638b4d5c6
++ * tests/openpgp/Makefile.am (XTESTS): Add the new test.
++ * tests/openpgp/gpgv.scm: New file.
++ * tests/openpgp/signed-messages.scm: Likewise.
++ * tests/openpgp/verify.scm: Move the signed messages to the new file
++ and load it.
++
++ gpg: Fix printing keyserver URLs and notation data.
++ + commit 890a3a70f2e1340d90c7f499358467979b182719
++ * g10/keylist.c (show_keyserver_url): Print to 'fp', not to 'stdout'.
++ (show_notation): Likewise.
++
++2017-06-20 Justus Winter <justus at g10code.com>
++
++ dirmngr: Properly handle SRV records.
++ + commit 48aae8167dcae80d43b08167a88d9eb170781a04
++ * dirmngr/ks-engine-hkp.c (enum ks_protocol): New type.
++ (struct hostinfo_s): New flags indicating whether we already did a
++ A lookup, or a SRV lookup per protocol. Turn 'port' into an array.
++ (create_new_hostinfo): Initialize new fields.
++ (add_host): Update the port for the given protocol.
++ (map_host): Simplify hosttable lookup misses. Check the SRV records
++ for both protocols on demand, do the A lookup just once. Return the
++ correct port.
++
++ dirmngr: Refactor variable-sized array code.
++ + commit fc4834d213af031b456c49c1ba5b5ef8873d1f18
++ * dirmngr/ks-engine-hkp.c (struct hostinfo_s): Add explicit length and
++ size fields.
++ (MAX_POOL_SIZE): New macro.
++ (create_new_hostinfo): Initialize new fields.
++ (host_in_pool_p): Adapt.
++ (select_random_host): Likewise.
++ (add_host): Likewise. Move the resizing logic here.
++ (hostinfo_sort_pool): New function.
++ (map_host): Simplify. Move the resizing logic away from here.
++ (ks_hkp_mark_host): Adapt.
++ (ks_hkp_print_hosttable): Likewise.
++
++ gpg: Fix error handling.
++ + commit badc1cdae52bd434e5fac2e4275575afeccc2837
++ * g10/keygen.c (generate_subkeypair): Handle errors from pinentry.
++
++2017-06-19 Werner Koch <wk at gnupg.org>
++
++ gpg,gpgsm: Fix compliance check for DSA and avoid an assert.
++ + commit 3621dbe52584bc8b417f61b5370ebaa5598db956
++ * common/compliance.c (gnupg_pk_is_compliant): Swap P and Q for DSA
++ check. Explicitly check for allowed ECC algos.
++ (gnupg_pk_is_allowed): Swap P and Q for DSA check.
++ * g10/mainproc.c (proc_encrypted): Simplify SYMKEYS check. Replace
++ assert by debug message.
++
++2017-06-19 Justus Winter <justus at g10code.com>
++
++ gpgscm: Limit the number of parallel jobs.
++ + commit 61ef43546ba9f0209692a1569d2f033436566a02
++ * ffi.c (do_wait_processes): Suppress the timeout error.
++ * tests.scm (semaphore): New definition.
++ (test-pool): Only run a bounded number of tests in parallel.
++ (test::started?): New function.
++ (run-tests-parallel): Do not report results, do not start the tests.
++ (run-tests-sequential): Adapt.
++ (run-tests): Parse the number of parallel jobs.
++
++ gpgscm: Improve option parsing.
++ + commit e555e7ed7de20fbbb1e3b005c32e292f29cc4a58
++ * tests/gpgscm/tests.scm (flag): Accept arguments of the form
++ '--foo=bar'.
++
++ gpgscm: Improve error handling of foreign functions.
++ + commit 6639aedaee051e8104d7f63b9a5812abf79440ed
++ * tests/gpgscm/ffi.scm (ffi-fail): Do not needlessly join the error
++ message.
++
++ gpgscm: Improve error reporting.
++ + commit 4c8be58fd46bb16332e84ab8ce978087dc5c68a3
++ * tests/gpgscm/init.scm (throw'): Guard against 'args' being atomic.
++ * tests/gpgscm/scheme.c (Eval_Cycle): Remove any superfluous colons in
++ error messages.
++
++ tests: Run the OpenPGP tests using the new extended key format.
++ + commit b766d3d1034e6068a91755ada68f7f7dbe2943b6
++ * tests/openpgp/all-tests.scm: Generalize a bit, and also add a
++ variant that uses the new extended key format.
++ * tests/openpgp/defs.scm (create-gpghome): Conditionally enable the
++ new extended key format.
++
++2017-06-19 Werner Koch <wk at gnupg.org>
++
++ Change license of some files to LGPLv2.1.
++ + commit 3419a339d9c4e800bf30e9021e05982d8c1021c1
++ * COPYING.LIB: Rename to COPYING.LGPL3.
++ * COPYING.LGPL21: New.
++ * COPYING.GPL2: New.
++ * Makefile.am: Distribute them.
++ * AUTHORS: Update license pointers. Add BSI as copyright holder.
++ * common/compliance.c, common/compliance.h: Add BSI copyright notice.
++ Break overlong lines.
++ * dirmngr/loadswdb.c: Add BSI copyright notices.
++ * dirmngr/server.c: Ditto.
++ * tools/call-dirmngr.c: Change license to LGPLv2.1. Add BSI
++ copyright notice.
++ * tools/call-dirmngr.h: Ditto.
++ * tools/gpg-wks-client.c: Ditto.
++ * tools/gpg-wks-server.c: Ditto.
++ * tools/gpg-wks.h: Ditto.
++ * tools/mime-maker.c: Ditto.
++ * tools/mime-maker.h: Ditto.
++ * tools/mime-parser.c: Ditto.
++ * tools/mime-parser.h: Ditto.
++ * tools/send-mail.c: Ditto.
++ * tools/send-mail.h: Ditto.
++ * tools/wks-receive.c: Ditto.
++ * tools/wks-util.c: Ditto.
++ * tools/rfc822parse.c, tools/rfc822parse.h: Change license to LGPLv2.1.
++
++2017-06-19 Justus Winter <justus at g10code.com>
++
++ gpg: Disable compliance module for other GnuPG components.
++ + commit 6e23416fe61d4130918f2d1bf6e1f98d102c4610
++ * common/compliance.c (gnupg_{pk,cipher,digest}_is_compliant): Return
++ false if the module is not initialized.
++ (gnupg_{pk,cipher,digest}_is_allowed): Return true if the module is
++ not initialized.
++ (gnupg_status_compliance_flag): Do not assert that the module is
++ initialized.
++ (gnupg_parse_compliance_option): Likewise.
++ (gnupg_compliance_option_string): Likewise.
++
++2017-06-14 Justus Winter <justus at g10code.com>
++
++ gpg: Check and fix keys on import.
++ + commit 9b12b45aa5e67d4d422bf75a3879df1d52dbe67f
++ * doc/gpg.texi: Document the new import option.
++ * g10/gpg.c (main): Make the new option default to yes.
++ * g10/import.c (parse_import_options): Parse the new option.
++ (import_one): Act on the new option.
++ * g10/options.h (IMPORT_REPAIR_KEYS): New macro.
++
++ gpg: Refactor key checking and fixing.
++ + commit 404fa8211b6188a0abe83ef43a4b44d528c0b035
++ * g10/Makefile.am (gpg_sources): Add new files.
++ * g10/gpgcompose.c (keyedit_print_one_sig): New stub.
++ * g10/keyedit.c (sig_comparison): Move to new module.
++ (check_all_keysigs): Likewise.
++ (fix_keyblock): Adapt callsite.
++ (keyedit_menu): Likewise.
++ * g10/key-check.c: New file.
++ * g10/key-check.h: Likewise.
++
++2017-06-13 Justus Winter <justus at g10code.com>
++
++ gpg: Refactor keyedit module.
++ + commit 8095d16b3ef6b5f01ec351824855708149f1c1c3
++ * g10/Makefile.am (gpg_SOURCES): Add new file.
++ * g10/keyedit.c (NODFLG_*): Move flags to the new header file.
++ (print_one_sig): Export symbol and rename accordingly.
++ (print_and_check_one_sig): Adapt accordingly.
++ (check_all_keysigs): Likewise.
++ * g10/keyedit.h: New file.
++ * g10/main.h: Drop declarations, include new header.
++
++ dirmngr: Implement querying nameservers over IPv6.
++ + commit 15d2a009931f44a60b9df6325f837add208459d6
++ * dirmngr/dns.c (dns_so_check): Reinitialize sockets on address family
++ mismatch.
++ (enum dns_res_state): New states for querying over IPv6.
++ (dns_res_exec): Implement the new states by copying and modifying the
++ IPv4 variants. Branch to their respective counterparts if the current
++ list of resolvers using the current address family is exhausted.
++
++2017-06-13 Werner Koch <wk at gnupg.org>
++
++ gpg: Disable keydb handle caching only for W32.
++ + commit e80925171ddb20c7e76c1db88c15ce2d9b09db86
++ * g10/getkey.c (getkey_end) [!W32]: Re-enable caching.
++
++ common: Fix -Wswitch warning.
++ + commit 7c91b48f0e80266cf7491c2bb7d8aabc12362643
++ * common/compliance.c (gnupg_digest_is_allowed): Don't include
++ GCRY_MD_WHIRLPOOL because it is not a digest_algo_t.
++
++2017-06-11 Neal H. Walfield <neal at g10code.com>
++
++ gpg: Send gpgcompose --help output to stdout, not stderr.
++ + commit 7aeac20f12ed257d3d159b304afeeac7f406c9d2
++ * g10/gpgcompose.c (show_help): Send gpgcompose --help output to
++ stdout, not stderr.
++
++ gpg: Improve some output of gpgcompose.
++ + commit cb0484e0762a1ce05d00d949f4b70162e2f7b82c
++
++
++ gpg: Support 'gpgcompose --encrypted-pop --help'
++ + commit 4ddf4e114c8df06d89144e857b7601de0b7e5a7c
++ * g10/gpgcompose.c (encrypted_pop_options): New variable.
++ (encrypted_pop): Support the --help option.
++
++ gpg: Remove dead code.
++ + commit 8a9066865688cf17594b2bdde4b260b0ef36d68e
++ * g10/gpgcompose.c (filter_pop): F->PKTTYPE will never be
++ PKT_ENCRYPTED_MDC.
++ (encrypted_pop): Likewise and there is no option --encrypted-mdc-pop.
++
++2017-06-08 Marcus Brinkmann <mb at g10code.com>
++
++ artwork: Add new banner.
++ + commit bc5503b2bf273b51d5dc59617e596f1cfb742fbc
++ * artwork/banner/banner-full.png: New file.
++ * artwork/banner/banner-rectangle.png: New file.
++ * artwork/banner/banner.svg: New file.
++ * artwork/banner/Bungee-Regular.ttf: New file.
++ * artwork/banner/Raleway-license.txt: New file.
++ * artwork/banner/banner-half.png: New file.
++ * artwork/banner/banner-skyscraper.png: New file.
++ * artwork/banner/Bungee-license.txt: New file.
++ * artwork/banner/Raleway-ExtraBold.ttf: New file.
++ * artwork/banner/Raleway-SemiBold.ttf: New file.
++
++2017-06-08 Justus Winter <justus at g10code.com>
++
++ common,gpg,sm: Restrict the use of algorithms according to CO_DE_VS.
++ + commit a64a55e10420cf11e00062b590dffe5d0c3e8192
++ * common/compliance.c (gnupg_pk_is_allowed): New function.
++ (gnupg_cipher_is_allowed): Likewise.
++ (gnupg_digest_is_allowed): Likewise.
++ * common/compliance.h (enum pk_use_case): New definition.
++ (gnupg_pk_is_allowed): New prototype.
++ (gnupg_cipher_is_allowed): Likewise.
++ (gnupg_digest_is_allowed): Likewise.
++ * g10/decrypt-data.c (decrypt_data): Restrict use of algorithms using
++ the new predicates.
++ * g10/encrypt.c (encrypt_crypt): Likewise.
++ * g10/gpg.c (main): Likewise.
++ * g10/pubkey-enc.c (get_session_key): Likewise.
++ * g10/sig-check.c (check_signature2): Likewise.
++ * g10/sign.c (do_sign): Likewise.
++ * sm/decrypt.c (gpgsm_decrypt): Likewise.
++ * sm/encrypt.c (gpgsm_encrypt): Likewise.
++ * sm/gpgsm.c (main): Likewise.
++ * sm/sign.c (gpgsm_sign): Likewise.
++ * sm/verify.c (gpgsm_verify): Likewise.
++
++ gpg: Fix computation of compliance with CO_DE_VS.
++ + commit b03fab09e188f7bb10237d4f20455e4026737e4e
++ * g10/mainproc.c (proc_encrypted): Symmetric encryption is also in
++ compliance with CO_DE_VS.
++
++2017-06-08 Werner Koch <wk at gnupg.org>
++
++ dirmngr: Implement HTTP connect timeouts of 15 or 2 seconds.
++ + commit 9b43220b8ad1a5c1cd51de3bbfff7ccbcc3fa877
++ * dirmngr/dirmngr.c (oConnectTimeout, oConnectQuickTimeout): New
++ enums.
++ (opts): New options --connect-timeout and --connect-quick-timeout.
++ (DEFAULT_CONNECT_TIMEOUT): New.
++ (DEFAULT_CONNECT_QUICK_TIMEOUT): New.
++ (parse_rereadable_options): Handle new options.
++ (post_option_parsing): New. Use instead of direct calls to
++ set_debug() and set_tor_mode ().
++ (main): Setup default timeouts.
++ (dirmngr_init_default_ctrl): Set standard connect timeout.
++ * dirmngr/dirmngr.h (opt): New fields connect_timeout and
++ connect_quick_timeout.
++ (server_control_s): New field timeout.
++ * dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass timeout to
++ http_raw_connect.
++ * dirmngr/ks-engine-hkp.c (send_request): Call
++ http_session_set_timeout.
++ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
++ * dirmngr/server.c (cmd_wkd_get, cmd_ks_search, cmd_ks_get)
++ (cmd_ks_fetch): Implement --quick option.
++
++ dirmngr: Allow a timeout for HTTP and other TCP connects.
++ + commit 5b9025cfa1f9b1c67ddf2f6bf87d863e780cf157
++ * dirmngr/http.c: Include fcntl.h.
++ (http_session_s): Add field 'connect_timeout'.
++ (http_session_new): Clear that.
++ (http_session_set_timeout): New function.
++ (my_wsagetlasterror) [W32]: New.
++ (connect_with_timeout): New function.
++ (connect_server): Add arg 'timeout' and call connect_with_timeout.
++ (send_request): Add arg 'timeout' and pass it to connect_server.
++ (http_raw_connect): Add arg 'timeout'.
++ (http_open): Pass TIMEOUT from the session to connect_server.
++
++ gpg: Avoid failure exit when scdaemon is disabled but not needed.
++ + commit 17e5afd80f247c356f03c71e8b61da424ffedabb
++ * g10/call-agent.c (warn_version_mismatch): Use log_info if error is
++ "not supported".
++
++2017-06-07 Justus Winter <justus at g10code.com>
++
++ common: Add cipher mode to compliance predicate.
++ + commit e051e396156211449568afa0ca7505dc13eaa3b4
++ * common/compliance.c (gnupg_cipher_is_compliant): Add mode parameter.
++ * common/compliance.h (gnupg_cipher_is_compliant): Likewise.
++ * g10/mainproc.c (proc_encrypted): Adapt callsite.
++ * sm/decrypt.c (gpgsm_decrypt): Likewise.
++
++ common,gpg,sm: Initialize compliance module.
++ + commit 21fc2508c979a8202dd8ca7fa7b801e0d62a5ceb
++ * common/compliance.c (gnupg_initialize_compliance): New function.
++ * common/compliance.h (gnupg_initialize_compliance): New prototype.
++ * g10/gpg.c (main): Use the new function.
++ * sm/gpgsm.c (main): Likewise.
++
++ common,gpg: Move the compliance option printer.
++ + commit f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc
++ * common/compliance.c (gnupg_compliance_option_string): New function.
++ * common/compliance.h (gnupg_compliance_option_string): New prototype.
++ * g10/encrypt.c (write_pubkey_enc_from_list): Update callsite.
++ * g10/gpg.c (main): Likewise.
++ * g10/keyedit.c (keyedit_menu): Likewise.
++ * g10/pkclist.c (build_pk_list): Likewise.
++ * g10/main.h (compliance_option_string): Remove prototype.
++ * g10/misc.c (compliance_option_string): Remove function.
++
++ common,gpg,sm: Move the compliance option parser.
++ + commit 842d233d408457cfa9a8473a6748472956f44e84
++ * common/compliance.c (gnupg_parse_compliance_option): New function.
++ * common/compliance.h (struct gnupg_compliance_option): New type.
++ (gnupg_parse_compliance_option): New prototype.
++ * g10/gpg.c (parse_compliance_option): Remove function.
++ (compliance_options): New variable.
++ (main): Adapt callsite.
++ * sm/gpgsm.c (main): Use the new common function.
++ * sm/gpgsm.h (opt): New field 'compliance'.
++
++ gpg: Improve compliance with CO_DE_VS.
++ + commit 027ce4ba37be1d052bca2f6109fe810ef57f4038
++ * g10/gpg.c (set_compliance_option): The specification, section 4.1.1,
++ forbids the use of encryption without integrity protection.
++
++2017-06-07 Andre Heinecke <aheinecke at intevation.de>
++
++ speedo: Fix a minor memleak in the installer.
++ + commit 13dc75a4e7cc2959003c08940fc53c6ece7b77e4
++ * build-aux/speedo/w32/g4wihelp.c (path_remove): Free path_new on
++ early return.
++
++2017-06-06 Andre Heinecke <aheinecke at intevation.de>
++
++ speedo: Fix source tar call ambiguity.
++ + commit 96acbdd7265f504d06783adfd6322a6675c41c0a
++ * build-aux/speedo.mk (dist-source): Expand exclude-vc to
++ exclude-vcs.
++
++2017-06-01 Justus Winter <justus at g10code.com>
++
++ gpg: Report compliance with CO_DE_VS.
++ + commit be8ca8852629786266db4d3d69b2c2fb03bd6365
++ * common/compliance.c (gnupg_pk_is_compliant): Add DSA with certain
++ parameters.
++ (gnupg_cipher_is_compliant): New function.
++ (gnupg_digest_is_compliant): Likewise.
++ * common/compliance.h (gnupg_cipher_is_compliant): New prototype.
++ (gnupg_digest_is_compliant): Likewise.
++ * common/status.h (STATUS_DECRYPTION_COMPLIANCE_MODE): New status.
++ (STATUS_VERIFICATION_COMPLIANCE_MODE): Likewise.
++ * doc/DETAILS: Document the new status lines.
++ * g10/mainproc.c (proc_encrypted): Compute compliance with CO_DE_VS
++ and report that using the new status line.
++ (check_sig_and_print): Likewise.
++ * sm/decrypt.c (gpgsm_decrypt): Likewise.
++ * sm/verify.c (gpgsm_verify): Likewise.
++
++ common: Improve checking for compliance with CO_DE_VS.
++ + commit 3b70f62423041e614332b90d782576ee6868a030
++ * common/compliance.c (gnupg_pk_is_compliant): Only certain RSA key
++ sizes are compliant.
++
++ gpg,common: Move the compliance framework.
++ + commit 8a012280e0f0a462c094d106355aa436fceb1b76
++ * common/Makefile.am (common_sources): Add new files.
++ * common/compliance.c: New file. Move 'gnupg_pk_is_compliant' here,
++ and tweak it to not rely on types private to gpg.
++ * common/compliance.h: New file. Move the compliance enum here.
++ * g10/keylist.c (print_compliance_flags): Adapt callsite.
++ * g10/main.h (gnupg_pk_is_compliant): Remove prototype.
++ * g10/misc.c (gnupg_pk_is_compliant): Remove function.
++ * g10/options.h (opt): Use the new compliance enum.
++ * sm/keylist.c (print_compliance_flags): Use the common functions.
++
++2017-05-31 Justus Winter <justus at g10code.com>
++
++ gpg: Fix compliance computation.
++ + commit 02af509dfc2b893720aa0c7b380fd7736b2bafd0
++ * g10/misc.c (gnupg_pk_is_compliant): Compare against CO_RFC2440, not
++ RFC2440 which is actually a predicate.
++
++ sm: Simplify code.
++ + commit f9cb15b385f64f7c9403670f03632f81a874f213
++ * sm/verify.c (gpgsm_verify): Simplify by using a newer gcrypt
++ interface.
++
++ doc: Improve documentation.
++ + commit 485b5a6e6dfe7aa545afa926e060d516ae911e42
++ * doc/gpgsm.texi: Mention that '--with-key-data' implies
++ '--with-colons'.
++
++2017-05-31 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Fix error from do_encryption.
++ + commit c03e0eb01dc4632432d0472a6f8051142082bea4
++ * agent/protect.c (do_encryption): Don't mask failure of OUTBUF
++ allocation.
++
++ scd: Fix error code on failure at usb_init.
++ + commit 8defb21d34410d000c8b776e0e3a1edd04762638
++ * scd/ccid-driver.c (ccid_dev_scan): Return GPG_ERR_ENODEV.
++
++ scd: Handle a failure of libusb_init.
++ + commit 5c33649782bf255af5a55f16eac5e85f059b00bf
++ * scd/ccid-driver.c (ccid_get_reader_list, ccid_dev_scan): Handle
++ failure.
++
++2017-05-30 Andre Heinecke <aheinecke at intevation.de>
++
++ gpg: Disable keydb handle caching.
++ + commit d3d640b9cc98dd0d06b49a2e4d46eb67af96fe29
++ * g10/getkey.c (getkey_end): Disable caching of the open keydb
++ handle.
++
++2017-05-30 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Fix memory leaks.
++ + commit 996544626ea416c173a940db47f47f9e5cbd844c
++ * agent/divert-scd.c (ask_for_card): Free WANT_KID and WANT_SN_DISP.
++ * agent/gpg-agent.c (create_server_socket): Free UNADDR.
++
++2017-05-25 Werner Koch <wk at gnupg.org>
++
++ dirmngr: This towel should better detect a changed resolv.conf.
++ + commit de3a0988ef9addccd6b5c7950fb8797afbc3978d
++ * dirmngr/dns-stuff.c (resolv_conf_changed_p): Fix initialization time
++ issue.
++
++ dirmngr: Re-init libdns resolver on towel change of resolv.conf.
++ + commit b5f356e9fba2d99909f8f54d7b7e6836bed87b68
++ * dirmngr/dns-stuff.c: Include sys/stat.h.
++ (RESOLV_CONF_NAME): New macro to replace a string.
++ (resolv_conf_changed_p): New.
++ (libdns_init): Call new function
++ (libdns_res_open): Ditto.
++
++2017-05-24 Justus Winter <justus at g10code.com>
++
++ agent: Make digest algorithms for ssh fingerprints configurable.
++ + commit 525f2c482abb6bc2002eb878b03558fb43e6b004
++ * agent/agent.h (opt): New field 'ssh_fingerprint_digest'.
++ * agent/command-ssh.c (data_sign, ssh_identity_register): Honor the
++ option for strings used to communicate with the user.
++ * agent/findkey.c (agent_modify_description): Likewise.
++ * agent/gpg-agent.c (cmd_and_opt_values): New value.
++ (opts): New option '--ssh-fingerprint-digest'.
++ (parse_rereadable_options): Set the default to MD5 for now.
++ (main): Handle the new option.
++ * doc/gpg-agent.texi: Document the new option.
++
++ agent: Write both ssh fingerprints to 'sshcontrol' file.
++ + commit a5f046d99a084b6a95268f03c1b588e8b78083cb
++ * agent/command-ssh.c (add_control_entry): Hand in the key, write both
++ the MD5- and the SHA256-based fingerprint to the 'sshcontrol' file
++ when adding ssh keys.
++ (ssh_identity_register): Adapt callsite.
++
++ common: Correctly render SHA256-based ssh fingerprints.
++ + commit 3a07a69dfc87b4fff610740d3dde8e23f0d2f8bc
++ * common/ssh-utils.c (dummy_realloc): New function.
++ (dummy_free): Likewise.
++ (get_fingerprint): Prepend the fingerprint with the name of the digest
++ algorithm. Correctly render SHA256-based ssh fingerprints.
++ * common/t-ssh-utils.c (sample_keys): Add SHA256 hashes for the keys.
++ (main): Add an option to dump the keys to gather fingerprints, also
++ print the SHA256 fingerprint for keys given as arguments, and check
++ the SHA256 fingerprints of the test keys.
++
++ common: Support different digest algorithms for ssh fingerprints.
++ + commit 3ac1a9d3a018816233a855faff059b4e0657a0f1
++ * common/ssh-utils.c (get_fingerprint): Add and honor 'algo' parameter.
++ (ssh_get_fingerprint{,_string}): Likewise.
++ * common/ssh-utils.h (ssh_get_fingerprint{,_string}): Update prototypes.
++ * common/t-ssh-utils.c (main): Adapt accordingly.
++ * agent/command-ssh.c (agent_raw_key_from_file): Likewise.
++ (ssh_identity_register): Likewise.
++ * agent/command.c (do_one_keyinfo): Likewise.
++ * agent/findkey.c (modify_description): Likewise.
++
++2017-05-22 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Add const qualifier for read-only table.
++ + commit 509e4a4d7491daf496b21e5892f4f63ab90e8e21
++ * agent/call-pinentry.c (start_pinentry): Add const to tbl.
++ * agent/command-ssh.c (request_specs): Add const.
++ (ssh_key_types): Likewise.
++ (request_spec_lookup): Add const to the return value and SPEC.
++ (ssh_request_process): Likewise.
++ * agent/protect.c (protect_info): Add const.
++ (agent_unprotect): Add const to algotable.
++
++ g10: Fix default-key selection for signing, possibly by card.
++ + commit fbb2259d22e6c6eadc2af722bdc52922da348677
++ * g10/call-agent.c (warn_version_mismatch): Revert.
++ (start_agent): Suppress version mismatch if relevant.
++ * g10/getkey.c (get_seckey_default_or_card): New.
++ * g10/skclist.c (build_sk_list): Use get_seckey_default_or_card.
++
++2017-05-18 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ doc: Fix spellings.
++ + commit 3713f67026467f63f80649c92ac4cc7973589855
++
++
++ docs: Point to https://dev.gnupg.org/ .
++ + commit 705da1eb23aef92c42d6d657b20a0984b104f72f
++ Replace mentions of bugs.gnupg.org with https://dev.gnupg.org/. Since
++ the project has transitioned to a better workflow for supporting
++ contributions, we should ensure that our documentation points to the
++ right place.
++
++2017-05-17 Justus Winter <justus at g10code.com>
++
++ gpgscm: Fix checking for opcode arguments.
++ + commit aae50e0b6a61549e226e0c7785260ad517f0ffff
++ * tests/gpgscm/scheme.c (Eval_Cycle): Update 'pcd' after dispatching
++ an instruction.
++
++ tests: Fix agent teardown in release builds.
++ + commit 0e1729bb993648deca84a2664ae78edc848d7003
++ * tests/openpgp/defs.scm (start-agent,stop-agent): Use gpg-conf which
++ will properly use the '--build-prefix' argument to make gpgconf use
++ tools from the build directory.
++
++2017-05-17 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Fix gpgcompose.c.
++ + commit ae95a7f5335e605fcd71fbe4a18ed384c88d590a
++ * g10/gpgcompose.c (show_help): Check return value.
++
++ g10: Suppress error for card availability check.
++ + commit a8dd96826f8484c0ae93c954035b95c2a75c80f2
++ * g10/call-agent.c (start_agent): Add semantics for card; Suppress
++ error for card check.
++ (warn_version_mismatch): Ignore an error for scdaemon.
++ (agent_scd_serialno): Call start_agent with
++ FLAG_FOR_CARD_SUPPRESS_ERRORS.
++
++2017-05-16 Justus Winter <justus at g10code.com>
++
++ tests: Configure the environments to use scdaemon from build tree.
++ + commit 386a7bbb245dd3ab7c4156a554adbe75d82bdf49
++ * tests/gpgme/gpgme-defs.scm: Use the scdaemon from the build tree
++ when writing a 'gpg-agent.conf'.
++ * tests/gpgsm/gpgsm-defs.scm: Likewise.
++ * tests/openpgp/defs.scm: Likewise.
++
+2017-05-15 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.21.
+ + commit 9574820329128f0ea8a98f9bfc0e77c73c3e0ec0
+
+
+ po: Update German translation.
+ + commit 4bd079dbdb44067688377156413dd32a82a89d22
+
+
+ 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 0ddcadb,0000000..a62db96
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.21
++2.1.22
diff --cc common/status-codes.h
index 9ff279c,0000000..7117c7f
mode 100644,000000..100644
--- a/common/status-codes.h
+++ b/common/status-codes.h
@@@ -1,240 -1,0 +1,246 @@@
+/* Output of mkstrtable.awk. DO NOT EDIT. */
+
+/* status.h - Status codes
+ * Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* The purpose of this complex string table is to produce
+ optimal code with a minimum of relocations. */
+
+static const char statusstr_msgstr[] =
+ "ENTER" "\0"
+ "LEAVE" "\0"
+ "ABORT" "\0"
+ "GOODSIG" "\0"
+ "BADSIG" "\0"
+ "ERRSIG" "\0"
+ "BADARMOR" "\0"
+ "TRUST_UNDEFINED" "\0"
+ "TRUST_NEVER" "\0"
+ "TRUST_MARGINAL" "\0"
+ "TRUST_FULLY" "\0"
+ "TRUST_ULTIMATE" "\0"
+ "NEED_PASSPHRASE" "\0"
+ "VALIDSIG" "\0"
+ "SIG_ID" "\0"
+ "ENC_TO" "\0"
+ "NODATA" "\0"
+ "BAD_PASSPHRASE" "\0"
+ "NO_PUBKEY" "\0"
+ "NO_SECKEY" "\0"
+ "NEED_PASSPHRASE_SYM" "\0"
+ "DECRYPTION_KEY" "\0"
+ "DECRYPTION_INFO" "\0"
+ "DECRYPTION_FAILED" "\0"
+ "DECRYPTION_OKAY" "\0"
+ "MISSING_PASSPHRASE" "\0"
+ "GOOD_PASSPHRASE" "\0"
+ "GOODMDC" "\0"
+ "BADMDC" "\0"
+ "ERRMDC" "\0"
+ "IMPORTED" "\0"
+ "IMPORT_OK" "\0"
+ "IMPORT_PROBLEM" "\0"
+ "IMPORT_RES" "\0"
+ "IMPORT_CHECK" "\0"
+ "EXPORTED" "\0"
+ "EXPORT_RES" "\0"
+ "FILE_START" "\0"
+ "FILE_DONE" "\0"
+ "FILE_ERROR" "\0"
+ "BEGIN_DECRYPTION" "\0"
+ "END_DECRYPTION" "\0"
+ "BEGIN_ENCRYPTION" "\0"
+ "END_ENCRYPTION" "\0"
+ "BEGIN_SIGNING" "\0"
+ "DELETE_PROBLEM" "\0"
+ "GET_BOOL" "\0"
+ "GET_LINE" "\0"
+ "GET_HIDDEN" "\0"
+ "GOT_IT" "\0"
+ "PROGRESS" "\0"
+ "SIG_CREATED" "\0"
+ "SESSION_KEY" "\0"
+ "NOTATION_NAME" "\0"
+ "NOTATION_FLAGS" "\0"
+ "NOTATION_DATA" "\0"
+ "POLICY_URL" "\0"
+ "KEY_CREATED" "\0"
+ "USERID_HINT" "\0"
+ "UNEXPECTED" "\0"
+ "INV_RECP" "\0"
+ "INV_SGNR" "\0"
+ "NO_RECP" "\0"
+ "NO_SGNR" "\0"
+ "KEY_CONSIDERED" "\0"
+ "ALREADY_SIGNED" "\0"
+ "KEYEXPIRED" "\0"
+ "KEYREVOKED" "\0"
+ "EXPSIG" "\0"
+ "EXPKEYSIG" "\0"
+ "ATTRIBUTE" "\0"
+ "REVKEYSIG" "\0"
+ "NEWSIG" "\0"
+ "SIG_SUBPACKET" "\0"
+ "PLAINTEXT" "\0"
+ "PLAINTEXT_LENGTH" "\0"
+ "KEY_NOT_CREATED" "\0"
+ "NEED_PASSPHRASE_PIN" "\0"
+ "CARDCTRL" "\0"
+ "SC_OP_FAILURE" "\0"
+ "SC_OP_SUCCESS" "\0"
+ "BACKUP_KEY_CREATED" "\0"
+ "PKA_TRUST_BAD" "\0"
+ "PKA_TRUST_GOOD" "\0"
+ "TOFU_USER" "\0"
+ "TOFU_STATS" "\0"
+ "TOFU_STATS_SHORT" "\0"
+ "TOFU_STATS_LONG" "\0"
++ "ENCRYPTION_COMPLIANCE_MODE" "\0"
++ "DECRYPTION_COMPLIANCE_MODE" "\0"
++ "VERIFICATION_COMPLIANCE_MODE" "\0"
+ "TRUNCATED" "\0"
+ "MOUNTPOINT" "\0"
+ "BLOCKDEV" "\0"
+ "PINENTRY_LAUNCHED" "\0"
+ "PLAINTEXT_FOLLOWS" "\0"
+ "ERROR" "\0"
+ "WARNING" "\0"
+ "SUCCESS" "\0"
+ "FAILURE" "\0"
+ "INQUIRE_MAXLEN";
+
+static const int statusstr_msgidx[] =
+ {
+ 0,
+ 6,
+ 12,
+ 18,
+ 26,
+ 33,
+ 40,
+ 49,
+ 65,
+ 77,
+ 92,
+ 104,
+ 119,
+ 135,
+ 144,
+ 151,
+ 158,
+ 165,
+ 180,
+ 190,
+ 200,
+ 220,
+ 235,
+ 251,
+ 269,
+ 285,
+ 304,
+ 320,
+ 328,
+ 335,
+ 342,
+ 351,
+ 361,
+ 376,
+ 387,
+ 400,
+ 409,
+ 420,
+ 431,
+ 441,
+ 452,
+ 469,
+ 484,
+ 501,
+ 516,
+ 530,
+ 545,
+ 554,
+ 563,
+ 574,
+ 581,
+ 590,
+ 602,
+ 614,
+ 628,
+ 643,
+ 657,
+ 668,
+ 680,
+ 692,
+ 703,
+ 712,
+ 721,
+ 729,
+ 737,
+ 752,
+ 767,
+ 778,
+ 789,
+ 796,
+ 806,
+ 816,
+ 826,
+ 833,
+ 847,
+ 857,
+ 874,
+ 890,
+ 910,
+ 919,
+ 933,
+ 947,
+ 966,
+ 980,
+ 995,
+ 1005,
+ 1016,
+ 1033,
+ 1049,
- 1059,
- 1070,
- 1079,
- 1097,
- 1115,
- 1121,
- 1129,
- 1137,
- 1145,
++ 1076,
++ 1103,
++ 1132,
++ 1142,
++ 1153,
++ 1162,
++ 1180,
++ 1198,
++ 1204,
++ 1212,
++ 1220,
++ 1228,
+
+ };
+
+#define statusstr_msgidxof(code) (0 ? -1 \
- : ((code >= 0) && (code <= 97)) ? (code - 0) \
++ : ((code >= 0) && (code <= 100)) ? (code - 0) \
+ : -1)
diff --cc doc/defsincdate
index 86b3aab,0000000..cc7dea6
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1494517260
++1501084380
diff --cc po/ca.po
index 8e8c8e5,3f8f601..9091c1a
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -36,7 -35,6 +36,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
@@@ -47,41 -45,32 +47,41 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to create a sign and encrypt key? "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Segur que voleu crear una clau de signatura i xifratge? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -89,7 -78,6 +89,7 @@@ msgstr "la contrasenya és invàlida
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -99,75 -87,59 +99,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "la contrasenya és errònia"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "la línia és massa llarga\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "la contrasenya és massa llarga\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "l'MPI és erroni"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "la contrasenya és errònia"
@@@ -177,155 -148,114 +177,155 @@@
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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "canvia la contrasenya"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
#, fuzzy
msgid "Admin PIN"
msgstr "Introduïu el nom d'usuari: "
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repetiu la contrasenya: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Repetiu la contrasenya: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repetiu la contrasenya: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -404,8 -321,6 +404,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "canvia la contrasenya"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -415,131 -330,102 +415,135 @@@ msgstr "
"Opcions:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "La clau ha estat substituïda"
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
- #: agent/gpg-agent.c: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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detall"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca claus en un servidor de claus"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualitza la base de dades de confiança"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOM|el joc de caràcters serà NOM"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
# Gènere? Nombre? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "no és suportat"
++#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
# Gènere? Nombre? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: agent/gpg-agent.c:237
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -548,179 -434,136 +552,184 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "l'algorisme de resum seleccionat no és vàlid\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Certificat de revocació vàlid"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "error en crear «%s»: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: no s'ha pogut crear el directori: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, 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:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -728,9 -571,6 +737,9 @@@ msgstr "
"@Ordres:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -784,8 -616,6 +793,8 @@@ msgstr "Cancel·la
msgid "error while asking for the passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -845,8 -666,6 +854,8 @@@ msgstr "
msgid "Yes"
msgstr "sí|si"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -897,19 -709,16 +906,19 @@@ msgstr "canvia la contrasenya
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "activa una clau"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -929,7 -735,6 +938,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
@@@ -971,8 -766,6 +980,8 @@@ msgstr "error en la creació de la cont
msgid "error creating a stream for a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -1103,7 -870,6 +1112,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
@@@ -1118,7 -882,6 +1127,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1244,8 -984,6 +1253,8 @@@ msgstr "armadura: %s\n
# Precissament acabem de parlar d'«implementat a la llista del GNOME
# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
# encara no m'agraden massa... jm
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1445,7 -1145,6 +1454,7 @@@ msgstr "opcions d'importació no vàlid
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "opcions d'importació no vàlides\n"
@@@ -1474,7 -1169,6 +1483,7 @@@ msgstr "
# Probablement és una clau, femení. jm
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "no forçat"
@@@ -1533,8 -1216,6 +1542,8 @@@ msgstr "no s'ha trobat la clau públic
msgid "waiting for lock %s...\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1670,7 -1325,6 +1679,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, fuzzy, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
@@@ -1679,39 -1332,37 +1688,46 @@@
msgid "Enter passphrase: "
msgstr "Introduïu la contrasenya: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
# FIXME: preferència? jm
# Ho discutírem en la llista, segur. Deu ser als arxius. ivb
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s encara no funciona amb %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la clau secreta no està disponible"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
# Destès? ivb
# Desatès, sí. jm
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
@@@ -1722,15 -1372,10 +1738,15 @@@ msgid "This command is only available f
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
# Parts? Peces? ivb
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "parts de la clau secreta no estan disponbles\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "La vostra selecció? "
@@@ -1792,154 -1424,107 +1808,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "no hi ha cap clau pública corresponent: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "preferències actualitzades"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "Empremta digital:"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "no s'han trobat dades OpenPGP vàlides.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1947,178 -1532,134 +1948,178 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr ""
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "La selecció és invàlida.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Seleccioneu la raó de la revocació:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Signar realment? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "ix del menú"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "les ordres entren en conflicte\n"
# «pantalla» o «ajuda»? ivb
# «ajuda», evidentment. jm
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "mostra aquesta ajuda"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "La clau és disponible en: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "canvia la data de caducitat"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "canvia la confiança"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra empremta"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "genera un nou parell de claus"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr ""
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr ""
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "L'ordre no és vàlida (proveu «help»)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@@ -2182,46 -1711,46 +2183,57 @@@ msgstr "hi ha una clau secreta per a l
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVÍS: «%s» és un fitxer buit\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "s'està llegint des de «%s»\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2230,42 -1759,36 +2242,43 @@@ msgstr "
"forçar l'algoritme de compressió %s (%d) viola les preferències del "
"destinatari\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s xifrat per a: «%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "dades xifrades amb %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "xifrat amb l'algoritme %d (desconegut)\n"
# És no-wrap? ivb
# Com? jm
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
"simètric.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problema en tractar amb un paquet xifrat\n"
@@@ -2357,42 -1863,33 +2370,42 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: es descarta: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "s'està escrivint en «%s»\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr ""
"clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
"descarta\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2462,237 -1946,189 +2475,242 @@@ msgstr "|NOM|usa NOM com a clau secret
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opcions d'importació no vàlides\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "|[fitxer]|crea una signatura"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "crea una signatura separada"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "xifra dades"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verifica una signatura"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "llista claus"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "llista claus i signatures"
# «de les claus» o «de la clau»? ivb
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "llista claus secretes"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "signa o edita una clau"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exporta claus"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exporta claus a un servidor de claus"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importa claus d'un servidor de claus"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "cerca claus en un servidor de claus"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importa/fon claus"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "actualitza la base de dades de confiança"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|xifra per a NOM"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "no fa cap canvi"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2703,7 -2139,6 +2721,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:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2733,13 -2168,11 +2751,13 @@@ msgstr "
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2759,7 -2192,6 +2777,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:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2767,554 -2199,423 +2785,536 @@@ msgstr "
"\n"
"Algoritmes suportats:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Clau pública: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Xifratge: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Dispersió: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Compressió: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "forma d'ús: gpg [opcions] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, 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:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "No és una adreça vàlida\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, 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:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, 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:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, 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:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, 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:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
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:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
#, 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:3749
++#: g10/gpg.c:3754
#, 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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, 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:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
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:5283
++#: g10/gpg.c:5329
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:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
@@@ -3328,7 -2627,6 +3328,7 @@@ msgstr "pren les claus d'aquest anell
msgid "make timestamp conflicts only a warning"
msgstr "fes els conflictes de marques de temps només un avís"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|escriu informació d'estat en aquest FD"
@@@ -3360,332 -2653,269 +3360,337 @@@ msgstr "No hi ha ajuda disponible
msgid "No help available for '%s'"
msgstr "No hi ha ajuda disponible per a `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "mostra empremta"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "la clau secreta és inusable"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "mostra empremta"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "es descarta un bloc de tipus %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "fins ara s'han processat %lu claus\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Nombre total processat: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sense ID: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importades: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " no modificades: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID d'usuaris nous: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subclaus noves: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noves revocacions: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "claus privades importades: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claus privades no canviades: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importades: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clau %08lX: l'ID no és vàlid\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "açò pot ser causat per l'absència d'autosignatura\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "clau %08lX: clau nova - es descarta \n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no s'ha trobat cap anell escrivible: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clau %08lX: no correspon a la nostra còpia\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clau %08lX: «%s» 1 signatura nova\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clau %08lX: «%s» 1 subclau nova\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clau %08lX: «%s» %d subclaus noves\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clau %08lX: «%s» no ha estat modificada\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "clau %08lX: s'ha importat la clau secreta\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
@@@ -3700,12 -2930,10 +3705,12 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@@ -3715,22 -2943,18 +3720,22 @@@
# O «rebutjara»? ivb
# Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
# «es rebutja» està bé. jm
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clau %08lX: no hi ha ID per a la signatura\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
@@@ -3738,116 -2962,95 +3743,116 @@@
"«%s»\n"
"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clau %08lX: Subclau de revocació no vàlida\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clau %08lX: es descarta l'ID d'usuari '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "clau %08lX: es descarta la subclau\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"clau %08lX: el certificat de revocació és en el lloc equivocat - es "
"descarta\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
"descarta\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació "
"%08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
"present.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@@ -3889,79 -3085,12 +3894,15 @@@ msgstr "error en la lectura de «%s»:
msgid "failed to rebuild keyring cache: %s\n"
msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocació]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autosignatura]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "signatura %s, algorisme de resum %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Signatura correcta de \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "es descarta «%s»: %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "L'ID d'usuari «%s» està revocat."
- msgstr[1] "L'ID d'usuari «%s» està revocat."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 signatura no comprovada per falta de clau\n"
- msgstr[1] "1 signatura no comprovada per falta de clau\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d signatures errònies\n"
- msgstr[1] "%d signatures errònies\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Signatura correcta de \""
- msgstr[1] "Signatura correcta de \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3973,70 -3102,55 +3914,70 @@@ msgstr "
"verificar les claus d'altres usuaris (mirant passaports,\n"
"comprovant empremtes de diferents fonts...)?\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Hi confie marginalment\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Hi confie plenament\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Segur que encara voleu signarla? (s/N) "
# O no s'ha pogut? ivb
# FIXME: comprovar context. jm
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " No es pot signar.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'ID d'usuari «%s» ha caducat."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4045,11 -3159,9 +3986,11 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura d'estil PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4058,11 -3170,9 +3999,11 @@@ msgstr "
"La vostra signatura actual en «%s»\n"
"ha caducat.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4071,43 -3181,34 +4012,43 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura local.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "«%s» ja estava signada amb la clau %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "No hi ha res que signar amb la clau %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "La clau ha caducat!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aquesta clau caducarà el %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4117,32 -3218,26 +4058,32 @@@ msgstr "
"pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
"contestar, entreu «0».\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No vaig a contestar.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) No ho he comprovat en absolut.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He fet algunes comprovacions.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) He fet comprovacions molt acurades.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4151,138 -3246,113 +4092,138 @@@ msgstr "
"Esteu segur que voleu signar aquesta clau\n"
"amb la vostra clau: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Açò serà una autosignatura.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"AVÍS: la signatura no es marcarà com a inexportable.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"AVÍS: la signatura no es marcarà com a irrevocable.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a inexportable.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a irrevocable.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"No he comprovat aquesta clau en absolut.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"He fet algunes comprovacions a aquesta clau.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"He comprovat aquesta clau amb molta cura.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "desa i ix"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra empremta"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Notació de signatura: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "llista claus i ID"
# Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb
# Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "tria l'ID d'usuari N"
# Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb
# Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "tria l'ID d'usuari N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "revoca signatures"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "signa la clau localment"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "afegeix un ID d'usuari"
@@@ -4290,139 -3360,110 +4231,139 @@@
# Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
# el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
# i no hem unificat en català. Potser li ho diré a Werner. jm.
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "afegeix un photo ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "esborra un ID d'usuari"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "esborra una clau secundària"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "afegeix una clau de revocació"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "No podeu canviar la data de caducitat de les claus v3\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marca l'ID d'usuari com a primari"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "llista les preferències (expert)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "llista les preferències (detallat)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "canvia la contrasenya"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "canvia la confiança"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un ID d'usuari"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una clau secundària"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "activa una clau"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "desactiva una clau"
# Igual que dalt. ivb
# Idem :) jm
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra el photo ID"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "La clau secreta està disponible.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Cal la clau secreta per a fer açò.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4430,299 -3471,245 +4371,309 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "La clau està revocada."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realment voleu signar tots els ID d'usuari? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Realment voleu signar tots els ID d'usuari? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "la classe de signatura és desconeguda"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "No podeu esborrar l'últim ID d'usuari!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Realment voleu eliminar aquesta clau? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Realment voleu revocar les claus seleccionades? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estableix la llista de preferències"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realment voleu actualitzar les preferències? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Voleu desar els canvis? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Voleu eixir sense desar? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "La clau no ha canviat, per tant no cal actualització.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "No podeu esborrar l'últim ID d'usuari!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "el valor no és vàlid\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Usuari inexistent.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "No hi ha res que signar amb la clau %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "error: l'empremta digital és invàlida\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "no s'ha trobat la clau «%s»: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Resum: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Funcionalitats: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notació: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
# Potser %s haja d'anar darrere de «clau». ivb
# És cert. Nova funcionalitat de 1.2.0, IIRC. jm
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Aquesta clau pot ser revocada per la clau %s "
# Potser %s haja d'anar darrere de «clau». ivb
# És cert. Nova funcionalitat de 1.2.0, IIRC. jm
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Aquesta clau pot ser revocada per la clau %s "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "no s'ha pogut creat %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada]"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr ""
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confiança: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Aquesta clau ha estat desactivada"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4730,20 -3717,14 +4681,20 @@@ msgstr "
"Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
"correcta a no ser que torneu a executar el programa.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4752,18 -3733,15 +4703,18 @@@ msgstr "
" causar que una ID d'usuari diferent esdevinga en la primària "
"assumida.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "No podeu canviar la data de caducitat de les claus v3\n"
# Photo ID com abans. ivb
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4772,38 -3750,30 +4723,38 @@@ msgstr "
"AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
"algunes versions de PGP rebutgen aquesta clau.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
# Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)? ivb
# Hmm. Sí... (s/N/x) jm
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
# Werner FIXME: use ngettext. jm
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4811,37 -3781,30 +4762,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "S'ha esborrat %d signatura.\n"
msgstr[1] "S'ha esborrat %d signatura.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "No s'hi ha eliminat res.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "invàlida"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "L'ID d'usuari «%s» està revocat."
msgstr[1] "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4850,41 -3813,33 +4801,41 @@@ msgstr "
"AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
"fer que algunes versions de PGP rebutjen aquesta clau.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduïu l'ID d'usuari del revocador designat: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4892,184 -3847,151 +4843,189 @@@
msgstr ""
"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No podeu canviar la data de caducitat de les claus v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Heu de seleccionar exactament un ID.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Notació de signatura: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Voleu sobreescriure? (s/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID d'usuari: «"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
"»\n"
"signat amb la vostra clau %08lX el %s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aquesta signatura va caducar el %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
# (s/N) ivb
# S! jm
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Heu signat els següents ID d'usuari:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocat per %08lX el %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Esteu a punt de revocar aquestes signatures:\n"
# (s/N)? ivb
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realment voleu crear els certificats de revocació? (s/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "ho hi ha clau secreta\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "No podeu esborrar l'últim ID d'usuari!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opcions d'importació no vàlides\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "la preferència %c%lu és duplicada\n"
@@@ -5519,8 -4364,6 +5475,8 @@@ msgstr "
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
@@@ -5595,7 -4425,6 +5551,7 @@@ msgstr "s'ha produït un error mentre s
msgid "public and secret key created and signed.\n"
msgstr "s'han creat i signat les claus pública i secreta.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5605,7 -4434,6 +5561,7 @@@ msgstr "
"\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
# Werner FIXME: Use ngettext. jm
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5614,7 -4442,6 +5570,7 @@@ msgstr "
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5622,51 -4449,40 +5578,51 @@@ msgstr "
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "mai "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Política de signatura crítica: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Política de signatura: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Notació de signatura crítica: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Notació de signatura: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5674,7 -4490,20 +5630,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d signatures errònies\n"
msgstr[1] "%d signatures errònies\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d signatures errònies\n"
+ msgstr[1] "%d signatures errònies\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 signatura no comprovada per falta de clau\n"
+ msgstr[1] "1 signatura no comprovada per falta de clau\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5682,41 -4511,33 +5654,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signatura no comprovada a causa d'un error\n"
msgstr[1] "1 signatura no comprovada a causa d'un error\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Anell"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Empremtes digital de la clau primària:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Empremta digital de la clau primària:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Empremta digital ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5829,270 -4629,221 +5801,276 @@@ msgstr "no s'ha trobat la clau «%s»:
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
# «del servidor», «en el servidor»? ivb
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "error de servidor de claus"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "clau de sessió xifrada amb %s\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "xifrat amb l'algoritme %d (desconegut)\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "la clau pública és %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr ""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "xifrat amb una clau %s, ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "xifrat amb %lu contrasenyes\n"
# FIXME WK: Use ngettext
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "xifrat amb 1 contrasenya\n"
# I no serà «dades xifrades amb %s»? ivb
# Sembla que sí, ho marque per a mirar-ho més endavant. jm
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "s'assumeixen dades xifrades amb %s\n"
# L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé! ivb
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
"en el seu lloc\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "desxifratge correcte\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom del fitxer original='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Signatura INCORRECTA de \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signatura caducada de \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "s'ha eliminat la verificació de signatura\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "no es poden tractar aquestes signatures múltiples\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# «%.*s» no serà una data? Caldrà «el» al davant. ivb
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "La clau és disponible en: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[incert]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Aquesta signatura caduca el %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binari"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "mode text"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "desconeguda"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "l'algoritme de clau pública és desconegut"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "No s'ha pogut comprovar la signatura: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "no és una signatura separada\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signatura autònoma de classe 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "signatura de l'estil antic (PGP 2.x)\n"
@@@ -6151,32 -4891,26 +6129,32 @@@ msgstr "error de lectura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -6185,7 -4919,6 +6163,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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "No comprimit"
@@@ -6193,31 -4926,25 +6171,31 @@@
# 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:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "No comprimit"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "la classe de signatura és desconeguda"
@@@ -6738,37 -5366,34 +6716,42 @@@ msgstr "no s'han pogut obrir les dades
msgid "can't open signed data fd=%d: %s\n"
msgstr "no s'han pogut obrir les dades signades `%s'\n"
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "clau %08lX: sense ID\n"
+
# Indi? ivb
# Yeh... jm
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "d'acord, som el destinatari anònim.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "la codificació antiga del DEK no està suportada\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6931,7 -5528,6 +6914,7 @@@ msgstr "(No es va donar una descripció
msgid "Is this okay? (y/N) "
msgstr "És açò correcte? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "s'hi ha creat una clau feble - reintent\n"
@@@ -6953,34 -5546,33 +6936,40 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostra més informació\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "la clau pública %08lX és %lu segons anterior a la signatura\n"
msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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"
@@@ -6988,7 -5580,6 +6977,7 @@@ msgstr[0] "la clau pública %08lX és %
msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
# Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7002,7 -5593,6 +6991,7 @@@ msgstr[1] "
"amb el rellotge)\n"
# Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -7014,44 -5604,37 +7003,44 @@@ msgstr[1] "
"la clau s'ha creat %lu segon en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: aquesta clau ha estat revocada!"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
"desconegut\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
"subclau\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
"expandida.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -7059,7 -5642,6 +7048,7 @@@ msgstr "
"AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
"no expandida.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -7068,43 -5650,35 +7057,43 @@@ msgstr "
"AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
"no expandida.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signatura de: «%s»\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "signatura:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "s'utilitzarà xifratge %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "es descarta «%s»: duplicat\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7196,7 -5754,6 +7185,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
@@@ -7308,17 -5843,14 +7297,17 @@@ msgstr "no es poden tractar línies mé
msgid "input line longer than %d characters\n"
msgstr "la línia d'entrada és superior a %d caràcters\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
@@@ -7328,134 -5860,108 +7317,134 @@@
# Precissament acabem de parlar d'«implementat a la llista del GNOME
# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
# encara no m'agraden massa... jm
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmes suportats:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "llista claus i ID"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "llista claus"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7463,68 -5969,58 +7452,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "xifrat amb %lu contrasenyes\n"
msgstr[1] "xifrat amb %lu contrasenyes\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [fitxers]|imprimeix resums de missatges"
@@@ -7532,150 -6028,124 +7521,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
# Werner FIXME: use ngettext. jm
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "S'han esborrat %d signatures.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "xifrat amb %lu contrasenyes\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Política: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7692,18 -6162,14 +7681,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7949,19 -6370,14 +7938,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -8010,44 -6417,35 +7999,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "elimina claus de l'anell públic"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@@ -8055,54 -6453,43 +8044,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "canvia la contrasenya"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -8112,26 -6499,21 +8101,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "canvia la contrasenya"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "canvia la contrasenya"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Seleccioneu la raó de la revocació:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -8139,118 -6521,94 +8128,118 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "canvia la contrasenya"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "canvia la contrasenya"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "«%s» ja està comprimida\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "genera un nou parell de claus"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "genera un nou parell de claus"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
# Ídem. ivb
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "l'URI no és suportada"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "La generació de claus ha fallat: %s\n"
msgstr[1] "La generació de claus ha fallat: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
@@@ -8272,11 -6627,9 +8261,11 @@@ msgstr "Introduïu el nom d'usuari:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
@@@ -8332,12 -6674,10 +8321,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8412,9 -6737,6 +8401,9 @@@ msgstr "error en la creació de la cont
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
@@@ -8613,7 -6895,6 +8602,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8668,7 -6942,6 +8657,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
@@@ -8934,11 -7154,9 +8923,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8967,140 -7180,109 +8956,140 @@@ msgstr "certificat duplicat: esborrat
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(No es va donar una descripció)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "llista claus secretes"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "Certificat de revocació vàlid"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "Certificat correcte"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "Certificat correcte"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea eixida amb armadura ascii"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "no usa el terminal en absolut"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
# Mode desatès (SC) ivb
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "mode desatès: no pregunta mai"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "suposa «sí» en la majoria de les preguntes"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "suposa «no» en la majoria de les preguntes"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "afegeix aquest anell a la llista"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|usa aquest servidor per a cercar claus"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|usa l'algoritme de xifratge NOM"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -9111,48 -7293,39 +9100,48 @@@ msgstr "
"signa, comprova, xifra o desxifra\n"
"l'operació predeterminada depén de les dades introduïdes\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(No es va donar una descripció)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = omet aquesta clau\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "error en la creació de la contrasenya: %s\n"
# No em passe! ;) ivb
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9215,7 -7376,6 +9204,7 @@@ msgstr "rev? hi ha problemes en la comp
msgid "error storing flags: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9244,7 -7400,6 +9233,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9258,51 -7412,41 +9247,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Aquesta signatura va caducar el %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Signatura correcta de \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " alias \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -10115,116 -8098,88 +10104,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Voleu eixir sense desar? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10237,77 -8192,61 +10226,77 @@@ msgstr "
"@\n"
"(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "forma d'ús: gpg [opcions] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s no és permés amb %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "la línia és massa llarga\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "error de lectura: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
@@@ -10316,17 -8255,14 +10305,17 @@@
# Probablement és una clau, femení. jm
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forçat"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10507,7 -8407,14 +10496,18 @@@ msgstr "«%s» no és un fitxer JPEG\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "error en la lectura de «%s»: %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@@ -10572,12 -8467,10 +10572,12 @@@ msgstr "s'està cercant «%s» al servi
msgid "malloc failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10641,12 -8522,6 +10641,7 @@@ msgstr "error mentre s'escrivia l'anel
msgid "error reading HTTP response for '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "error en la lectura de «%s»: %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -10765,77 -8616,61 +10760,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10972,193 -8778,146 +10967,193 @@@ msgstr "Ha fallat el procés de signatu
msgid "error sending standard options: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usa el mode de contrasenya especificat"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "error en la creació de la contrasenya: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOM|xifra per a NOM"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "error de la xarxa"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "la contrasenya és errònia"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "no s'ha trobat la clau pública"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -11231,27 -8974,22 +11226,27 @@@ msgstr "fitxer d'eixida
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "no s'ha trobat la clau pública"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr ""
diff --cc po/cs.po
index 1881a1f,487ccce..6a23975
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -45,7 -44,6 +45,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "získání zámku pinetry se nezdařilo: %s\n"
@@@ -56,45 -54,35 +56,45 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|_Zrušit"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr "|pinentry-label|_Ano"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr "|pinentry-label|_Ne"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr "|pinentry-label|_Uložit do správce hesel"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Opravdu chcete učinit heslo na obrazovce viditelným?"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr "|pinentry-tt|Zviditelnit heslo"
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
msgid "|pinentry-tt|Hide passphrase"
msgstr "|pinentry-tt|Skrýt heslo"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Kvalita:"
@@@ -104,73 -92,57 +104,73 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Kvalita textu zde zadaného.\n"
"Na podrobnosti ohledně kritérií se zeptejte svého správce."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
"Prosím, zadejte váš PIN, aby pro tuto relaci mohl být odemknut tajný klíč"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
"Prosím, zadejte vaše heslo, aby pro tuto relaci mohl být odemknut tajný klíč"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Heslo:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "neshodují se – zkuste to znovu"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (pokus %d z %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "Znovu:"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "PIN je příliš dlouhý"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Heslo je příliš dlouhé"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Neplatný znak v PINu"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "PIN je příliš krátký"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Špatný PIN"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Špatné heslo"
@@@ -179,57 -150,35 +179,57 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "nelze vytvořit „%s“: %s\n"
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "nelze otevřít „%s“: %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "nalezena karta se sériovým číslem: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "nenalezen žádný vhodný klíč karty: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Povolit"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Zakázat"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Prosím, vložte toto heslo znovu"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -264,63 -208,49 +264,63 @@@ 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:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Prosím, vložte kartu se sériovým číslem"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Prosím, vyjměte kartu a vložte jinou se sériovým číslem"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "PIN správce"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Resetační kód"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0APro vstup použijte klávesnici čtečky."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Zopakujte resetační kód"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Zopakujte tento PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Zopakujte tento PIN"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Resetační kód nebyl správně zopakován; zkuste to znovu"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK nebyl zopakován správně; zkuste to znovu"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN nebyl zopakován správně; zkuste to znovu"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Prosím, vložte PIN%s%s%s, abyste odemkli kartu"
@@@ -399,8 -316,6 +399,8 @@@ msgstr "Pro ochranu svého nového klí
msgid "Please enter the new passphrase"
msgstr "Prosím, zadejte nové heslo"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -408,138 -323,102 +408,142 @@@ msgstr "
"@Volby:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "poběží v režimu démona (na pozadí)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "poběží v režimu serveru (na popředí)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "pracovat v režimu serveru"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "být o trochu víc tichý"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "vypisovat příkazy ve stylu sh"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "vypisovat příkazy ve stylu csh"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|SOUBOR|načíst volby ze SOUBORU"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "neodpojovat se od konzole"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "neuzurpovat si klávesnici a myš"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "použít pro server soubor s protokolem"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "nepoužívat SCdémona"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
msgid "|NAME|accept some commands via NAME"
msgstr "|NÁZEV|přijímat některé příkazy přes NÁZEV"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ignorovat požadavky na změnu TTY"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ignorovat požadavky na změnu X displeje"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|zahodit zapamatované PINy po N sekundách"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "nepoužívat paměť PINů na podepisování"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "disallow the use of an external password cache"
msgstr "nedovolit použít vnější úložiště na hesla"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "umožnit přednastavení hesla"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "allow caller to override the pinentry"
msgid "disallow caller to override the pinentry"
msgstr "umožnit volajícímu přebít pinentry"
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr "umožnit zadání hesla skrze Emacs"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "zapnout podporu pro OpenSSH"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
"připomínky k překladu hlaste na <gnupg-i18n at gnupg.org>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -547,145 -426,111 +551,150 @@@ 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:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "vybraný hashovací algoritmus je neplatný\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "čtou se možnosti z „%s“\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Poznámka: „%s“ není uvažovaná možnost\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "socket nelze vytvořit: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "název socketu „%s“ je příliš dlouhý\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent již běží – nový nebude spuštěn\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "chyba při získávání soli pro socket\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba při přilepování socketu na „%s“: %s\n"
# TODO: i18n of first %s
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "volání listen() selhalo: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "volání stat() na „%s“ selhalo: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "„%s“ nelze použít jako domovský adresář\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba při čtení soli z deskriptoru %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "obsluha 0x%lx pro fd %d spuštěna\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obsluha 0x%lx pro fd %d ukončena\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "SSH obsluha 0x%lx pro fd %d spuštěna\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "SSH obsluha 0x%lx pro fd %d ukončena\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s pozastaveno\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Použití: gpg-preset-passphrase [volby] KEYGRIP (-h pro nápovědu)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -693,8 -538,6 +702,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:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -702,9 -545,6 +711,9 @@@ msgstr "
"@Příkazy:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -759,8 -591,6 +768,8 @@@ msgstr "zrušeno\n
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba při ptaní se na heslo: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba při otevírání „%s“: %s\n"
@@@ -820,8 -641,6 +829,8 @@@ msgstr "
msgid "Yes"
msgstr "Ano"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Ne"
@@@ -872,7 -684,6 +881,7 @@@ msgstr "Změnit heslo
msgid "I'll change it later"
msgstr "Změním jej později"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -880,11 -691,9 +889,11 @@@
msgstr ""
"Opravdu chcete smazat klíč určený pomocí keygripu%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "Smazat klíč"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -906,7 -712,6 +915,7 @@@ msgstr "%s klíč používá nebezpečn
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "%zubitový hash není platný pro %ubitový %s klíč\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
@@@ -944,8 -739,6 +953,8 @@@ msgstr "chyba při vytváření roury:
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba při vytváření proudu pro rouru: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "chyba při rozdvojování procesu: %s\n"
@@@ -1074,7 -841,6 +1083,7 @@@ msgstr "při pokusu alokovat %lu bajt�
msgid "out of core while allocating %lu bytes"
msgstr "při pokusu alokovat %lu bajtů došla paměť"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "chyba při alokování dostatečného množství paměti: %s\n"
@@@ -1089,7 -853,6 +1098,7 @@@ msgstr "%s:%u: zastaralý parametr „%
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "neznámý ladicí příznak „%s“ se ignoruje\n"
@@@ -1193,8 -933,6 +1202,8 @@@ msgstr "Vytvořen klíč relace
msgid "algorithm: %s"
msgstr "algoritmus: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "nepodporovaný algoritmus: %s"
@@@ -1360,7 -1060,6 +1369,7 @@@ msgstr "neplatný parametr
msgid "missing argument for option \"%.50s\"\n"
msgstr "postrádám argument u volby „%.50s“\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "neplatný argument u volby „%.50s“\n"
@@@ -1386,7 -1081,6 +1395,7 @@@ msgid "command \"%.50s\" is ambiguous\n
msgstr "příkaz „%.50s“ není jednoznačný\n"
# Yet another expression for `not enough memory' :)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "nedostatek paměti\n"
@@@ -1445,8 -1128,6 +1454,8 @@@ msgid "waiting for lock %s...\n
msgstr "čekám na zámek %s…\n"
# První argument je název knihovny
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s je příliš stará (potřeba %s, přítomna %s)\n"
@@@ -1576,7 -1231,6 +1585,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "předání dotazu %s klientovi se nezdařilo\n"
@@@ -1585,35 -1238,33 +1594,42 @@@
msgid "Enter passphrase: "
msgstr "Vložte heslo: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "VAROVÁNÍ: "
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s dosud není funkční s %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP karta není dostupná: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta číslo %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "nelze provést v dávkovém módu\n"
@@@ -1621,14 -1271,9 +1637,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Resetační kód není nebo už není dostupný\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Váš výběr? "
@@@ -1685,90 -1317,55 +1701,75 @@@ msgstr "Chyba: jméno a příjmení je
msgid "URL to retrieve public key: "
msgstr "URL pro získání veřejného klíče: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Chyba: URL je příliš dlouhé (limit je %d znaků).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
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:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba při zápisu do „%s“: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Login (jménu účtu): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Chyba: Login je příliš dlouhý (limit je %d znaků).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Privátní DO data: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Chyba: Privátní DO je příliš dlouhé (limit je %d znaků).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Jazykové předvolby: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Zadejte pohlaví: M – mužské, F – ženské, nebo stiskněte mezerník: "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Chyba: neplatná odpověď.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "Otisk CA: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Chyba: chybně utvořené otisk.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "operace s klíčem není možná: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "toto není OpenPGP karta"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "chyba při získání informací o aktuálním klíči: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Přepsat existující klíč? (a/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1779,55 -1376,43 +1780,55 @@@ msgstr "
"dokumentace\n"
" své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Jakou délku klíče pro podepisování si přejete? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Jakou délku klíče pro šifrování si přejete? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Jakou délku klíče pro autentizaci si přejete? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "velikost klíče %s musí být v intervalu %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Karta bude nyní přenastavena na generování klíče dlouhého %u bitů\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "chyba při změně velikosti klíče %d na %u bitů: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Vytvořit zálohu šifrovacího klíče mimo kartu? (A/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Přepsat existující klíče? (a/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1838,162 -1423,118 +1839,162 @@@ msgstr "
" PIN = „%s“ PIN administrátora = „%s“\n"
"Měli byste je změnit příkazem --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Prosím, vyberte druh klíče, který chcete generovat:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Podepisovací klíč\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Šifrovací klíč\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Autentizační klíč\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Neplatný výběr.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Prosím vyberte místo pro uchování klíče:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Volání KEYTOCARD selhalo: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
msgid "This command is not supported by this card\n"
msgstr "Tento příkaz není touto kartou podporován\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Poznámka: Tento příkaz zničí všechny klíče uložené na kartě!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
msgid "Continue? (y/N) "
msgstr "Pokračovat (a/N) "
# The code expects non-localized "yes"
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "ukončit toto menu"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "zobraz administrátorské příkazy"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "ukázat tuto pomoc"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "vypiš všechna dostupná data"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "změní jméno majitele karty"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "změní URL pro získání klíče"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "získá klíč specifikovaný v URL karty"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "změnit login name"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "změnit jazykové předvolby"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "změní pohlaví držitele karty"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "vypsat otisk certifikační autority"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "zapnout/vypnout požadování PINu při každé self-sign operaci"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "vytvořit nový pár klíčů"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "nabídka pro změnu anebo odblokování PINu"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "ověř PIN a vypiš všechna data"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "odblokovat PIN pomocí resetačního kódu"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr "zničit všechny klíče a data"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/karta> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "pouze administrátorské příkazy\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "administrátorské příkazy jsou povoleny\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "administrátorské příkazy nejsou povoleny\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatný příkaz (zkuste „help“)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba při čtení bloku klíče: %s\n"
@@@ -2054,43 -1583,45 +2055,56 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"abyste ho smazal(a), použijte nejprve parametr „--delete-secret-key“.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba při vytváření hesla: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "v módu S2K nelze použít symetrický ESK paket\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "použití šifry: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "„%s“ je již zkomprimován\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROVÁNÍ: soubor „%s“ je prázdný\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "čte se z „%s“\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"VAROVÁNÍ: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "použití šifrovacího algoritmu „%s“ v módu %s není dovoleno\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2099,37 -1630,31 +2113,38 @@@ msgstr "
"VAROVÁNÍ: vyžádaný komprimační algoritmus %s (%d) nevyhovuje předvolbám "
"příjemce\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zašifrovaný pro: „%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "použití %s není v módu %s dovoleno\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s zašifrovaná data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "zašifrováno neznámým algoritmem %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "VAROVÁNÍ: zpráva byla zašifrována slabým klíčem v symetrické šifře.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problém se zašifrovaným paketem\n"
@@@ -2212,37 -1720,28 +2227,37 @@@ msgstr "odstranit při exportu z klí�
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
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:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "zapisuje se do „%s“\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "klíč %s: tělo klíče je na kartě – přeskočeno\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "exportování tajného klíče není povoleno\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "klíč %s: PGP 2.x klíč – přeskočeno\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2316,177 -1802,140 +2331,183 @@@ msgid "all values passed to '%s' ignore
msgstr ""
# c-format
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "vytvořit podpis"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "vytvořit podpis v čitelném dokumentu"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "vytvořit podpis oddělený od dokumentu"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "šifrovat data"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "šifrování pouze se symetrickou šifrou"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "dešifrovat data (implicitně)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verifikovat podpis"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "vypsat seznam klíčů"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "vypsat seznam klíčů a podpisů"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy klíčů"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "vypsat seznam klíčů a otisků"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "vypsat seznam tajných klíčů"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "vytvořit nový pár klíčů"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "rychle vytvořit nový pár klíčů"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
msgid "quickly add a new user-id"
msgstr "rychle přidat novou identitu uživatele"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, 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:466
++#: g10/gpg.c:469
#, 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:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "komplexní vytvoření páru klíčů"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "vytvořit revokační certifikát"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "odstranit klíč ze souboru veřejných klíčů"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "odstranit klíč ze souboru tajných klíčů"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "rychle podepsat klíč"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "rychle lokálně podepsat klíč"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "podepsat klíč"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "podepsat klíč lokálně"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat klíč"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "změnit heslo"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exportovat klíče"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exportovat klíče na server klíčů"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importovat klíče ze serveru klíčů"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "vyhledat klíče na serveru klíčů"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "aktualizovat všechny klíče ze serveru klíčů"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importovat/sloučit klíče"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "vytisknout stav karty"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "změnit data na kartě"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "změnit PIN karty"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "aktualizovat databázi důvěry"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "vypsat hash zprávy"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "pracovat v režimu serveru"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
#, 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 -1943,33 +2515,43 @@@ msgstr "
"|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
"[špatný], ask [zeptat se], auto)"
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "vytvoř výstup zakódovaný pomocí ASCII"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
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:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "použít kanonický textový mód"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|SOUBOR|zapsat výstup do SOUBORU"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "neprovádět žádné změny"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "vyžádat potvrzení před přepsáním"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "použít chování striktně podle OpenPGP"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2538,7 -1977,6 +2559,7 @@@ msgstr "
"@\n"
"(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2566,11 -2004,9 +2587,11 @@@ msgstr "
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat otisky\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2580,7 -2016,6 +2601,7 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2588,78 -2023,63 +2609,78 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Veřejný klíč: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Šifra: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Komprese: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "použití: %s [přepínače] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "konfliktní příkazy\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "no = podpis nalezen v definici skupiny „%s“\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2667,21 -2087,18 +2688,21 @@@ msgstr "
"VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2689,7 -2106,6 +2710,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:1605
++#: g10/gpg.c:1610
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
@@@ -2697,442 -2113,332 +2718,426 @@@
"nastavena bezpečně\n"
# c-format
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznámá konfigurační položka „%s“\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "zobrazovat ID fotografií během výpisu klíčů"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "ukazovat URL politik během výpisu podpisů"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "ukazovat všechny poznámky během výpisu podpisů"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
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:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
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:1952
++#: g10/gpg.c:1957
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:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "ukazovat název souboru s klíči při výpisu klíčů"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "ukazovat data expirace během výpisu podpisů"
- #: 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:2069
++#: g10/gpg.c:2074
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "neznámá TOFU politika „%s“\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr "(možnosti lze vypsat příkazem „help“)\n"
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný režim pinentry „%s“\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "„%s“ není platná znaková sada\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru klíčů\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parametr pro import\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "neplatný parametr pro export\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parametr pro výpis\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "zobrazovat ID fotografií při ověřování podpisu"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "ukazovat URL politik při ověřování podpisu"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "ukazovat všechny poznámky při ověřování podpisu"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
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:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
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:3251
++#: g10/gpg.c:3250
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:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "ověřovat podpisy s daty PKA"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parametr pro ověření\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "neplatný parametr pro ověření\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVÁNÍ: %s přepíše %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Není dovoleno používat %s s %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný kompresní algoritmus je neplatný\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
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:3743
++#: g10/gpg.c:3748
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:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "neplatné implicitní předvolby\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "neplatné uživatelské předvolby pro šifrování\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "neplatné uživatelské předvolby pro hashování\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "neplatné uživatelské předvolby pro komprimaci\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
- #: 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:3863
- #, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+ #, fuzzy, c-format
+ #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "použití hashovacího algoritmu „%s“ v módu %s není dovoleno\n"
- #: g10/gpg.c:3868
- #, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+ #, fuzzy, c-format
+ #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "použití kompresního algoritmu „%s“ v módu %s není dovoleno\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "nelze použít --symmetric --encrypt v módu %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódování z ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódování do ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus „%s“\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, 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:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu…\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pro certifikační politiku je neplatné\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pro podepisovací politiku je neplatné\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
@@@ -3144,7 -2448,6 +3149,7 @@@ msgstr "|SOUBOR|brát klíče z klíč
msgid "make timestamp conflicts only a warning"
msgstr "pouze varování při konfliktu časového razítka"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|zapsat informace o stavu do tohoto FD"
@@@ -3173,141 -2471,117 +3178,147 @@@ msgstr "Nápověda není k dispozici
msgid "No help available for '%s'"
msgstr "Pro „%s“ není dostupná žádná nápověda"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "importovat podpisy, které jsou označeny jen jako místní"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "opravit poškození vzniklá při importu z PKS serveru"
- #: g10/import.c:158
++#: g10/import.c:166
msgid "do not clear the ownertrust values during import"
msgstr "nemazat údaje o důvěře během importu"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "neaktualizovat databázi důvěry po importu"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "vypsat otisk klíče"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "přijímat aktualizace pouze u existujících klíčů"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "odstranit z klíče po importu nepoužitelné části"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "odstranit po importu z klíče vše, co lze"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "předpokládat vstup v binárním formátu"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "vypsat otisk klíče"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d byl přeskočen\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu klíče byly doposud zpracovány\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkový počet zpracovaných klíčů: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " přeskočeny klíče PGP2: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " přeskočeny nové klíče: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez ID uživatele: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importováno: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " beze změn: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nové ID uživatelů: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nové podklíče: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nové podpisy: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nové revokace klíčů: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " přečtené tajné klíče: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importované tajné klíče: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajné klíče nezměněny: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportováno: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " odstraněné podpisy: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " odstraněné uživatelské ID: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3316,189 -2590,151 +3327,189 @@@ msgstr "
"VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
"algoritmy na těchto ID uživatelů:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": předvolby pro šifrovací algoritmus %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": předvolby pro podepisovací algoritmus %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": předvolby pro komprimační algoritmus %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "velmi doporučujeme aktualizaci nastavení vašich preferencí a\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"distribuci tohoto klíče aby jste předešel problémům s neshodou algoritmů\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "klíč %s: chybí identifikátor uživatele\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "klíč %s: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "zamítnut kontrolou při importu"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klíč %s: poškození PKS podklíče opraveno\n"
# c-format
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "klíč %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klíč %s: chybí platný identifikátor uživatele\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "může to být způsobeno chybějícím podpisem klíče jím samým\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klíč %s: nový klíč - přeskočen\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klíč %s: veřejný klíč „%s“ importován\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klíč %s: neodpovídá naší kopii\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klíč %s: „%s“ 1 nový identifikátor uživatele\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "klíč %s: „%s“ %d nových identifikátorů uživatele\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klíč %s: „%s“ 1 nový podpis\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klíč %s: „%s“ %d nových podpisů\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klíč %s: „%s“ 1 nový podklíč\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klíč %s: „%s“ %d nových podklíčů\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klíč %s: „%s“ beze změn\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klíč %s: tajný klíč importován\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "klíč %s: tajný klíč již existuje\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "klíč %s: chyba při odesílání dat agentovi: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "tajný klíč %s: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "import tajných klíčů není povolen\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "klíč %s: tajný klíč s neplatnou šifrou %d – přeskočeno\n"
@@@ -3513,139 -2749,112 +3524,139 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Pro migraci „%s“ u každé karty spusťte: %s\n"
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klíč %s: neplatný revokační certifikát: %s – zamítnuto\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klíč %s: „%s“ revokační certifikát importován\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"klíč %s: nepodporovaný algoritmus veřejného klíče u uživatelského ID „%s“\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "klíč %s neplatný podpis klíče jím samým u uživatelského ID „%s“\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "klíč %s: neplatný podpis klíče jím samým (direct key signature)\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klíč %s: neexistuje podklíč pro vázání klíčů\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klíč %s: neplatná vazba podklíče\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klíč %s: smazána vícenásobná vazba podklíče\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klíč %s: neplatný revokační podklíč\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klíč %s: smazána vícenásobná revokace podklíče\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klíč %s: přeskočen identifikátor uživatele „%s“\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klíč %s: podklíč přeskočen\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "klíč %s: podpis není exportovatelný (třída %02X) - přeskočeno\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "klíč %s: revokační certifikát na špatném místě - přeskočeno \n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "klíč %s: neplatný revokační certifikát: %s - přeskočen\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "klíč %s: podpis podklíče na špatném místě - přeskočeno \n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "klíč %s: neočekávaná podpisová třída (0x%02X) - přeskočeno\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROVÁNÍ: klíč %s může být revokován: zkouším získat revokační klíč %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VAROVÁNÍ: klíč %s může být revokován: revokační klíč %s nenalezen.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klíč %s: „%s“ přidán revokační certifikát\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klíč %s: podpis klíče jím samým (direct key signature) přidán\n"
@@@ -3685,89 -2887,12 +3696,15 @@@ msgstr "chyba při otevírání databá
msgid "failed to rebuild keyring cache: %s\n"
msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revokace]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[podpis klíče jím samým]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "karta nepodporuje hashovací algoritmus %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "Good signature from"
- msgid " (reordered signatures follow)"
- msgstr "Dobrý podpis od"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "key %s: %s\n"
- msgid "key %s:\n"
- msgstr "klíč %s: %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
- msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
- msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 podpis neověřen, protože chybí klíč\n"
- msgstr[1] "1 podpis neověřen, protože chybí klíč\n"
- msgstr[2] "1 podpis neověřen, protože chybí klíč\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d špatných podpisů\n"
- msgstr[1] "%d špatných podpisů\n"
- msgstr[2] "%d špatných podpisů\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Dobrý podpis od"
- msgstr[1] "Dobrý podpis od"
- msgstr[2] "Dobrý podpis od"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3779,17 -2904,14 +3716,17 @@@ msgstr "
"kontrolou otisků z různých zdrojů…)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Důvěřuji částečně\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Důvěřuji úplně\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3799,52 -2921,40 +3736,52 @@@ msgstr "
"Hloubka větší než 1 umožňuje klíčům, které jste podepsal\n"
"podepsat jiný klíč, který bude pro Vás důvěryhodný.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Prosím vložte doménu, pro kterou je podpis omezen nebo stiskněte enter pro "
"podpis bez omezení na doménu.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "Přeskakuje se ID uživatele „%s“, což není textové ID.\n"
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uživatelské ID „%s“ je revokováno."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Jste si jistý(á), že stále chcete podepsat tento klíč? (a/N) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Nelze podepsat.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Vypršela platnost uživatelského ID „%s“."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID uživatele „%s“ není podepsáno jím samým."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID uživatele „%s“ je připraveno k podpisu."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Podepsat? (a/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3853,11 -2963,9 +3790,11 @@@ msgstr "
"Podpis klíče „%s“ jím samým je\n"
"podpis formátu PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Přejete si jej změnit na formát OpenPGP? (a/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3866,13 -2974,11 +3803,13 @@@ msgstr "
"Platnost vašeho podpisu na „%s“\n"
"vypršela.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Chcete vytvořit nový podpis a nahradit jím ten, jehož platnost vypršela? (a/"
"N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3881,43 -2987,34 +3818,43 @@@ msgstr "
"Váš současný podpis na „%s“\n"
"je pouze lokální.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Přejete si jej změnit na plně exportovatelný podpise? (a/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "„%s“ je již lokálně podepsán klíčem %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "„%s“ je již podepsán klíčem %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Chcete klíč přesto znova podepsat? (a/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nic k podepsání klíčem %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Platnost klíče vypršela!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnost klíče vyprší %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Chcete, aby platnost Vašeho podpisu vypršela ve stejnou dobu? (A/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3927,31 -3024,25 +3864,31 @@@ msgstr "
"patří výše uvedené osobě.\n"
"Pokud neznáte odpověď, zadejte „0“.\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpovím.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nijak jsem to nekontroloval(a).%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Částečně jsem to ověřil(a).%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Velmi pečlivě jsem to ověřil(a).%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3960,221 -3051,167 +3897,221 @@@ msgstr "
"Jste si jistý(á), že chcete podepsat tento klíč\n"
"svým klíčem „%s“ (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Jedná se o podpis klíče jím samým.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "VAROVÁNÍ: podpis nebude označen jako neexportovatelný.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "VAROVÁNÍ: podpis nebude označen jako neodvolatelný (non-revocable).\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis bude označen jako neexportovatelný.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis bude označen jako neodvolatelný (non-revocable).\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Nijak jsem tento klíč neověřil.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Částečně jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Skutečně podepsat? (a/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "podepsání selhalo: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"K dispozici je jen kontrolní součet klíče nebo je klíč na kartě - passphrase "
"nelze změnit.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "klíč %s: chyba při měnění hesla: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "uložit a ukončit"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "vypsat otisk klíče"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
msgid "show the keygrip"
msgstr "ukázat keygrip"
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "vypsat seznam klíčů a id uživatelů"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "vyberte identifikátor uživatele N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "vyberte podklíč N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "kontrolovat podpisy"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr "podepsat vybrané ID uživatele [* níže jsou uvedeny relevantní příkazy]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "podepsat vybrané uživatelské ID lokálně"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "přidat identifikátor uživatele"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "přidat fotografický ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "smazat vybrané ID uživatele"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "přidat podklíč"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "přidat klíč na kartu"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "přesunout klíč na kartu"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "přesunout záložní klíč na kartu"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "smazat vybrané podklíče"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "přidat revokační klíč"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "smazat podpisy z vybraných uživatelských ID"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "změnit datum expirace pro klíč nebo vybrané podklíče"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "označit vybrané uživatelské ID jako primární"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "vypsat seznam předvoleb (pro experty)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "vypsat seznam předvoleb (podrobně)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "nastavit URL preferovaného serveru klíčů pro vybraná uživatelská ID"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "zadat poznámku pro vybraná uživatelská ID"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "změnit heslo"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "změnit důvěryhodnost vlastníka klíče"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "revokovat podpisu na vybraných uživatelských ID"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "revokovat vybrané uživatelské ID"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "revokovat klíč nebo vybrané podklíče"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "nastavit klíč jako platný (enable)"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "nastavit klíč jako neplatný (disable)"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "ukázat vybrané fotografické ID"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"směstnat nepoužitelná ID uživatelů a odstranit z klíče nepoužitelné podpisy"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "směstnat nepoužitelná ID uživatelů a odstranit z klíče všechny podpisy"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Tajný klíč je dostupný.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4185,276 -3222,224 +4122,288 @@@ msgstr "
" s „t“ pro důvěryhodný podpis (tsign) nebo „nr“ pro neodvolatelný\n"
" podpis (nrsign) nebo libovolnou jejich kombinací (ltsign, tnrsign, atd.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Klíč revokován."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
msgid "Really sign all text user IDs? (y/N) "
msgstr "Opravdu podepsat všechna textová ID uživatele? (a/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Neznámý typ podpisu „%s“\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tento příkaz není v módů %s dovolený.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Použijte příkaz „%s“.)\n"
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Nemůžete smazat poslední id uživatele!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Opravdu odstranit tento id uživatele? (a/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Opravdu přesunout primární klíč? (a/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Musíte vybrat právě jeden klíč.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Příkaz očekává jméno souboru jako argument\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nelze otevřít „%s“: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Chyba při čtení záložního klíče z „%s“: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Musíte vybrat alespoň jeden klíč.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Opravdu chcete smazat tento klíč? (a/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Opravdu revokovat tento id uživatele? (a/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Důvěryhodnost vlastníka nelze měnit je-li používána databáze důvěry "
"poskytnutá uživatelem\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Nastavit seznam předvoleb:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Opravdu aktualizovat předvolby pro vybraný id uživatele? (a/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Opravdu aktualizovat předvolby? (a/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Uložit změny? (a/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Ukončit bez uložení? (a/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "aktualizace selhala: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Klíč nebyl změněn, takže není potřeba jej aktualizovat.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Nemůžete smazat poslední id uživatele!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "„%s“ není otisk\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "„%s“ není primární otisk\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "read error in '%s': %s\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "chyba při čtení v „%s“: %s\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "Žádný identifikátor uživatele neodpovídá."
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "Nic na podepsání.\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "'%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "\"%s\" is not a fingerprint\n"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "„%s“ není otisk\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "klíč „%s“ nenalezen\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Hash: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Vlastnosti: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Keyserver bez modifikace"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Preferovaný keyserver: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Poznámky: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Uživatelský ID formátu PGP 2.x nemá žádné předvolby\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "V %s byl následující klíč revokován %s klíčem %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Tento klíč může být revokován %s klíčem %s "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(citlivá informace)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "vytvořen: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "revokován: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "platnost skončila: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "platnost skončí: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "použití: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "číslo karty: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "důvěra: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "platnost: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Tento klíč byl označen za neplatný (disabled)"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4463,18 -3448,12 +4412,18 @@@ 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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "platnost skončila"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4482,15 -3461,12 +4431,15 @@@ msgstr "
"VAROVÁNÍ: žádné uživatelské ID nebylo označeno jako primární. Tento příkaz\n"
" může způsobit, že za primární bude považováno jiné user ID.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "Dobu platnosti také můžete změnit.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4499,35 -3475,27 +4448,35 @@@ msgstr "
"VAROVÁNÍ: Toto je PGP2 klíč. Přidání fotografického ID může v některých\n"
" verzích PGP vést k odmítnutí tohoto klíče.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Neměli by jste přidávat fotografický ID k PGP2 klíči.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Smazat tento dobrý podpis? (a/N/u)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Smazat tento neplatný podpis? (a/N/u)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Smazat tento neznámý podpis? (a/N/u)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4536,20 -3504,16 +4485,20 @@@ msgstr[0] "Smazán %d podpis.\n
msgstr[1] "Smazán %d podpis.\n"
msgstr[2] "Smazán %d podpis.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nic nebylo smazáno.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "neplatný"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4558,17 -3522,14 +4507,17 @@@ msgstr[0] "Uživatelské ID „%s“: %
msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uživatelské ID „%s“: je již minimalizované\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uživatelské ID „%s“: je již odstraněné\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4577,207 -3538,167 +4526,213 @@@ msgstr "
"VAROVÁNÍ: Toto je PGP2 klíč. Přidání 'pověření revokace' může v některých\n"
" verzích PGP vést k odmítnutí tohoto klíče.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Neměli by jste přidávat 'pověření revokace' k PGP2 klíči.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Vložte identifikátor uživatele pověřeného revokací: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "klíč formátu PGP 2.x nelze pověřit revokací\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "klíč nelze pověřit revokací jím samým\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "tento klíč již byl pověřen revokací\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"VAROVÁNÍ: ustanovení klíče „pověřeným odvolatelem“ je nevratná operace!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Jste si jistí, že tento klíč chcete pověřit revokací? (a/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "Jste si jistí, že chcete změnit dobu expirace více podklíčům? (a/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Měním dobu expirace podklíče.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Měním dobu expirace primárního klíče.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nemůžete změnit dobu platnosti klíče verze 3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "podepisovací podklíč %s je již křížově certifikován\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "podklíč %s nepodepisuje, a tak není třeba jej křížově certifikovat\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Prosím, vyberte právě jeden id uživatele .\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "přeskočen v3 podpis klíče jím samým u uživatelského id „%s“\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Vložte URL preferovaného serveru klíčů: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Jste si jistý(á), že jej chcete přepsat? (a/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Vložte poznámku: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Pokračovat (a/N)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje uživatelské ID s hashem %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Neexistuje podklíč s ID klíče „%s“.\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje podklíč s indexem %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID uživatele: „%s“\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podepsáno vaším klíčem %s v %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (neexportovatelné)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnost podpisu vyprší %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Jste si jistý, že jej chcete stále revokovat? (a/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvořit pro tento podpis revokační certifikát? (a/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Nepodepsáno vámi.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Podepsal(a) jste následující identifikátory uživatele: %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (neodvolatelné)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revokováno vaším klíčem %s v %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Chystáte se revokovat tyto podpisy:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "neexistuje tajný klíč\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "uživatelské ID „%s“ je již revokováno\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "VAROVÁNÍ: podpis ID uživatele je datován %d sekund v budoucnosti\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Nemůžete smazat poslední id uživatele!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klíč %s je již revokován.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklíč %s je již revokován.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíč %s (uid %d)\n"
++#: g10/keygen.c: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/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "duplicita předvolby „%s“\n"
@@@ -5211,8 -4055,6 +5166,8 @@@ msgstr "
"používat disky); díky tomu má generátor lepší šanci získat dostatek "
"entropie.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoření klíče se nepodařilo: %s\n"
@@@ -5283,7 -4112,6 +5238,7 @@@ msgstr "chyba při zápisu do souboru v
msgid "public and secret key created and signed.\n"
msgstr "veřejný a tajný klíč byly vytvořeny a podepsány.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5291,7 -4119,6 +5246,7 @@@ msgstr "
"Tento klíč nemůže být použitý pro šifrování. K vytvoření\n"
"sekundárního klíče pro tento účel můžete použít příkaz „--edit-key“.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5299,7 -4126,6 +5254,7 @@@ msgstr "
"klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5307,47 -4133,36 +5262,47 @@@ msgstr "
"klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Poznámka: vytvoření podklíčů pro klíče v3 není v souladu s OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajné části primárního klíče nejsou dostupné.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajná část primárního klíče jsou uloženy na kartě.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Opravdu vytvořit? (a/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritická podepisovací politika: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Podepisovací politika: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Kriticky preferovaný keyserver: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kritická podepisovací notace: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Podepisovací notace: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d good signatures\n"
msgid "%d good signature\n"
@@@ -5356,7 -4171,22 +5311,25 @@@ msgstr[0] "%d dobrých podpisů\n
msgstr[1] "%d dobrých podpisů\n"
msgstr[2] "%d dobrých podpisů\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d špatných podpisů\n"
+ msgstr[1] "%d špatných podpisů\n"
+ msgstr[2] "%d špatných podpisů\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 podpis neověřen, protože chybí klíč\n"
+ msgstr[1] "1 podpis neověřen, protože chybí klíč\n"
+ msgstr[2] "1 podpis neověřen, protože chybí klíč\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5365,7 -4195,6 +5338,7 @@@ msgstr[0] "1 podpis neověřen, protož
msgstr[1] "1 podpis neověřen, protože vznikla chyba\n"
msgstr[2] "1 podpis neověřen, protože vznikla chyba\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
@@@ -5374,33 -4203,26 +5347,33 @@@ msgstr[0] "Pozor: %lu klíč(ů) přesk
msgstr[1] "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
msgstr[2] "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Soubor klíčů (keyring)"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Otisk primárního klíče:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Otisk podklíče:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Otisk primárního klíče:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Otisk podklíče:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Otisk klíče ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Sériové číslo karty ="
@@@ -5514,264 -4315,215 +5487,270 @@@ msgstr "klíč nebyl na serveru klíč�
msgid "no keyserver known (use option --keyserver)\n"
msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "požaduji klíč %s ze %s server %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "požaduji klíč %s z %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "žádná operace se serverem klíčů!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "přeskočen „%s“: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "posílám klíč %s na %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "požaduje se klíč z „%s“\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVÁNÍ: URI %s nelze získat: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "podivná velikost šifrovacího klíče pro sezení (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s zašifrovaný klíč sezení\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "heslo (passphrase) generováno s použitím neznámého algoritmu %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "veřejný klíč je %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "data zašifrována veřejným klíčem: správný DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "zašifrována %u-bitovým %s klíčem, ID %s, vytvořeným %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " „%s“\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
# [kw]
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "zašifrováno %s klíčem, ID %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dešifrování veřejným klíčem selhalo: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "zašifrováno s heslem %lu\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "zašifrováno jedním heslem\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "předpokládám %s šifrovaných dat\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"algoritmus IDEA není dostupný; optimisticky se jej pokusíme nahradit "
"algoritmem %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROVÁNÍ: zpráva nebyla chráněna proti porušení její integrity\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "dešifrování o.k.\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVÁNÍ: se zašifrovanou zprávou bylo manipulováno!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "dešifrování selhalo: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Poznámka: odesílatel považoval data za důvěrná („for-your-eyes-only“)\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "původní jméno souboru='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VAROVÁNÍ: zachyceno více prostých textů\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"samostatný revokační certifikát – použijte „gpg --import“, chcete-li jej "
"užít\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "nenalezen žádná podpis\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ŠPATNÝ podpis od „%s“"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypršenou platností od „%s“"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Dobrý podpis od „%s“"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "verifikace podpisu potlačena\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Podpis vytvořen %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " použití %s klíče %s\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpis vytvořen %s pomocí klíče %s s ID uživatele %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " alias „%s“"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Klíč k dispozici na: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[nejistý]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " alias „%s“"
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "VAROVÁNÍ: Tento klíč není certifikován důvěryhodným podpisem!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnost podpisu skončila %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnost podpisu skončí %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binární formát"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "textový formát"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "neznámý formát"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr ", algoritmus klíče"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "POZOR: nejedná se o oddělený podpis. Soubor „%s“ NEBYL ověřen!\n"
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemohu ověřit podpis: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "toto není podpis oddělený od dokumentu\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "VAROVÁNÍ: detekováno více podpisů. Kontrolován bude pouze první.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatný podpis třídy 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starého typu (PGP 2.x)\n"
@@@ -5830,68 -4571,55 +5809,68 @@@ msgstr "chyba při čtení v „%s“:
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: použití parametru „%s“ se nedoporučuje\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, 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:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "použijte místo něj „%s%s“ \n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Nezkomprimováno"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "nezkomprimováno|nic"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "nejednoznačná volba „%s“\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "neznámá volba „%s“\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
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:1848
++#: g10/misc.c:1742
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "neznámý slabý hashovací algoritmus „%s“\n"
@@@ -6390,35 -5019,33 +6369,41 @@@ msgstr "nelze otevřít podepsaná dat
msgid "can't open signed data fd=%d: %s\n"
msgstr "nelze otevřít podepsaná data na deskriptoru=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "certifikát není použitelný pro šifrování\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonymní adresát; zkouším tajný klíč %s…\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "o.k., my jsme anonymní adresát.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "staré kódování DEK není podporováno\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "šifrovací algoritmus %d%s je neznámý nebo je zneplatněn\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "VAROVÁNÍ: v předvolbách příjemce nenalezen šifrovací algoritmus %s\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Poznámka: platnost tajného klíče %s skončila v %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "Poznámka: klíč byl odvolán"
@@@ -6588,7 -5187,6 +6573,7 @@@ msgstr "(Nebyl zadán Žádný popis)\n
msgid "Is this okay? (y/N) "
msgstr "Je důvod revokace vybrán správně? (a/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "vytvořen slabý klíč – zkouším znovu\n"
@@@ -6609,26 -5204,26 +6594,32 @@@ msgstr "%s klíč %s používá nebezpe
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "%s klíč %s vyžaduje hash o délce %zu nebo více bitů (hash je %s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávě\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "použití %s není v módu %s dovoleno\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VAROVÁNÍ: podepisovací podklíč %s není křížově certifikován\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "více informací naleznete na adrese %s\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "VAROVÁNÍ: podepisovací podklíč %s má neplatnou křížovou certifikaci\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6637,7 -5232,6 +6628,7 @@@ msgstr[0] "veřejný klíč %s je o %l
msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6646,7 -5240,6 +6637,7 @@@ msgstr[0] "veřejný klíč %s je o %l
msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6664,7 -5257,6 +6655,7 @@@ msgstr[2] "
"klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6681,41 -5273,34 +6672,41 @@@ msgstr[2] "
"klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Poznámka: podpisovému klíči %s skončila platnost v %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Poznámka: podpisový klíč %s byl odvolán\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"předpokládám špatný podpis klíčem %s, protože je nastaven neznámý kritický "
"bit\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "klíč %s: neexistuje podklíč pro revokaci podklíče\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "klíč %s: podklíč který je svázán s podpisem neexistuje\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VAROVÁNÍ: nelze %%-expandovat notaci (příliš dlouhé). Použity "
"neexpandované.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6723,7 -5308,6 +6714,7 @@@ msgstr "
"VAROVÁNÍ: nemohu %%-expandovat URL politiky (příliš dlouhé). Použity "
"neexpandované.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6732,12 -5316,10 +6723,12 @@@ msgstr "
"VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
"Použity neexpandované.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s podpis od: „%s“\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6745,31 -5327,25 +6736,31 @@@ msgstr "
"VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
"příjemce\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "podepisuji:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude použito šifrování %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "přeskočen „%s“: duplikován\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "přeskočeno: tajný klíč je už v databázi\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"toto je PGP klíč vygenerovaný podle algoritmu Elgamal,\n"
@@@ -6854,7 -5414,6 +6845,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "k „%s“ nelze přistoupit: %s\n"
@@@ -6963,89 -5500,71 +6954,89 @@@ msgstr "nemohu pracovat s řádky delš
msgid "input line longer than %d characters\n"
msgstr "vstupní řádek je delší než %d znaků\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "chyba při odesílání standardního parametru: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "nepodporovaný algoritmus: %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "chyba při vytváření dočasného souboru: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "chyba při zápisu kódování base64: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "chyba při inicializaci čtecího objektu: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba při otevírání „%s“: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, c-format
msgid "The email address \"%s\" is associated with %d key!"
msgid_plural "The email address \"%s\" is associated with %d keys!"
@@@ -7053,42 -5572,35 +7044,42 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "platnost: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, 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:1730
++#: g10/tofu.c:1729
#, 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"
@@@ -7096,18 -5608,15 +7087,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vypsat seznam klíčů"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7116,7 -5625,6 +7107,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7125,7 -5633,6 +7116,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:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7134,7 -5641,6 +7125,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7143,7 -5649,6 +7134,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7151,7 -5656,6 +7142,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1858
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7159,7 -5663,6 +7150,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1869
++#: g10/tofu.c:1868
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7167,7 -5670,6 +7158,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1875
++#: g10/tofu.c:1874
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7175,7 -5677,6 +7166,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1885
++#: g10/tofu.c:1884
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7183,7 -5684,6 +7174,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1891
++#: g10/tofu.c:1890
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7191,12 -5691,10 +7182,12 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7205,48 -5703,39 +7196,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, 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:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, 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:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7254,7 -5743,6 +7245,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7262,7 -5750,6 +7253,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7270,7 -5757,6 +7261,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7278,7 -5764,6 +7269,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7286,7 -5771,6 +7277,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7294,7 -5778,6 +7285,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7302,18 -5785,15 +7293,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Smazáno %d podpisů.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7322,13 -5802,11 +7313,13 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "zašifrováno s heslem %lu\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7337,31 -5815,25 +7328,31 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "platnost: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7379,19 -5851,15 +7370,19 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, 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:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7630,19 -6053,14 +7621,19 @@@ msgstr "
"Syntaxe: kbxutil [volby] [soubory]\n"
"Vypisuje, exportuje, importuje schránku na klíče (keybox).\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "schází RSA modulus nebo nemá velikost %d bitů\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "schází veřejný RSA exponent nebo je delší než %d bitů\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "funkce PIN callback skončila chybou: %s\n"
@@@ -7695,44 -6104,35 +7686,44 @@@ msgstr "
"|NP|Prosím, zadejte kód pro odblokování (PUK) klíče určeného na tvorbu "
"kvalifikovaných podpisů."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "chyba při získání nového PINu: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "uložení otisku se nezdařilo: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "uložení data vytvoření se nezdařilo: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "chyba při získání CHV z karty\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "odpověď neobsahuje RSA modulus\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "odpověď neobsahuje veřejný RSA exponent\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the EC public point\n"
msgid "response does not contain the EC public key\n"
msgstr "odpověď neobsahuje veřejný bod EC\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "odpověď neobsahuje veřejný klíč\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "čtení veřejného klíče se nezdařilo: %s\n"
@@@ -7740,57 -6140,46 +7731,57 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "používám implicitní PIN jako %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"použití implicitního PINu jako %s selhalo: %s – vypínám jeho budoucí "
"použití\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Prosím vložte PIN"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN pro CHV%d je příliš krátký; minimální délka je %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "ověření CHV%d se nezdařilo: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "karta je trvale uzamčena!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7805,23 -6194,18 +7796,23 @@@ msgstr[2] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Prosím, zadejte PIN správce"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "přístup k administrátorským příkazům není nakonfigurován\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Prosím vložte PIN"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Prosím, zadejte resetační kód karty"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Resetační kód je příliš krátký; minimální délka je %d\n"
@@@ -7829,77 -6213,59 +7820,77 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Nový resetační kód"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Nový PIN správce"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Nový PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||Prosím, zadejte PIN správce a nový PIN správce"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Prosím, zadejte PIN a nový PIN"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "chyba při čtení aplikačních dat\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "chyba při čtení otisku DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "klíč již existuje\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "existující klíč bude přepsán\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "generování nového klíče\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "nový klíč se zapisuje\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "chybí časové razítko vytvoření\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "schází RSA prime %s nebo nemá velikost %d bitů\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nelze uložit klíč: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
msgid "unsupported curve\n"
msgstr "nepodporovaná křivka\n"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "prosím počkejte než bude klíč vygenerován…\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "generování klíče se nezdařilo\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -7908,30 -6274,24 +7899,30 @@@ msgstr[0] "generování klíče dokonč
msgstr[1] "generování klíče dokončeno (%d sekund)\n"
msgstr[2] "generování klíče dokončeno (%d sekund)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "otisk na kartě se neshoduje s požadovaným\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "karta nepodporuje hashovací algoritmus %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dosud vytvořené podpisy: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "ověření PIN správce je nyní prostřednictvím tohoto příkazu zakázáno\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@@ -7951,11 -6308,9 +7942,11 @@@ msgstr "|N|Prvotní nový PIN
msgid "run in multi server mode (foreground)"
msgstr "pracovat ve více serverové režimu (na popředí)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|SOUBOR|zapisovat protokol do SOUBORU"
@@@ -8008,12 -6352,10 +7999,12 @@@ msgid "please use the option '--daemon
msgstr ""
"prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "obsluha pro deskriptor %d spuštěna\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obsluha pro deskriptor %d ukončena\n"
@@@ -8084,9 -6411,6 +8075,9 @@@ msgstr "počet odpovídajících certif
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "hledání klíče pouze ve vyrovnávací paměti dirmngr neuspělo: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "alokace popisovače keyDB se nezdařila\n"
@@@ -8258,7 -6542,6 +8249,7 @@@ msgstr "použit ověřovací model: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "%ubitový hash není platná pro %ubitový %s klíč\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(toto je algoritmus MD2)\n"
@@@ -8304,7 -6580,6 +8295,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "žádné použití klíče není určeno – předpokládají se všechna použití\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba při zjišťování informací o použití klíče: %s\n"
@@@ -8561,11 -6783,9 +8552,11 @@@ msgstr "Hotovo. Nyní byste měli tuto
msgid "resource problem: out of core\n"
msgstr "problém se zdroji: nedostatek paměti\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(toto je algoritmus RC2)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(toto nevypadá jako zašifrovaná zpráva)\n"
@@@ -8594,127 -6809,96 +8585,127 @@@ msgstr "certifikát „%s“ smazán\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "smazání certifikátu „%s“ se nezdařilo: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "(nebyli zadáni Žádní platní příjemci)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "vypsat seznam externích klíčů"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "vypsat řetěz certifikátů"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "importovat certifikáty"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "exportovat certifikáty"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "zaregistrovat čipovou kartu"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "předat příkaz do dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "vyvolat gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "vytvářet výstup zakódovaný pomocí Base-64"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "předpokládat vstup ve formátu PEM"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "předpokládat vstup ve formátu Base-64"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "předpokládat vstup v binárním formátu"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "nikdy nenahlížet do CRL"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "kontrolovat platnost pomocí OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|počet certifikátů, které zahrnout"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|SOUBOR|vzít politiky ze SOUBORU"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "nekontrolovat politiky certifikátu"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "stahovat chybějící certifikáty vydavatelů"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "vůbec nepoužívat terminál"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "dávkový režim: nikdy se neptat"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "předpokládat ano na většinu otázek"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "předpokládat ne na většinu otázek"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|SOUBOR|přidat klíčenku na seznam klíčenek"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klíč"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|použít tento server pro dohledávání klíčů"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NÁZEV|použít šifrovací algoritmus NÁZEV"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NÁZEV|použít hashovací algoritmus NÁZEV"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8724,46 -6908,37 +8715,46 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje pomocí protokolu S/MIME.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Poznámka: nebude možné šifrovat pro „%s“: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "neznámý model ověřování „%s“\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: nebyl zadán název stroje\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: zadáno heslo bez uživatele\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: přeskakuji tento řádek\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "nelze rozebrat serveru klíčů\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importují se běžné certifikáty „%s“\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nelze podepsat pomocí „%s“: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@@ -8824,7 -6987,6 +8815,7 @@@ msgstr "problém při opakovaném hled�
msgid "error storing flags: %s\n"
msgstr "chyba při ukládání příznaků: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Chyba – "
@@@ -8859,7 -7017,6 +8850,7 @@@ msgstr "
"\n"
"%s%sJste si skutečně jisti, že to chcete udělat?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8878,50 -7034,40 +8869,50 @@@ msgstr "
"„%s“\n"
"Vezměte na vědomí, že tento certifikát NEVYTVOŘÍ kvalifikovaný podpis!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"hashovací algoritmus %d (%s) podepisovatele %d není podporován; použiji %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "hashovací algoritmus použitý pro podepisovatele %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "kontrola kvalifikovaného certifikátu selhala: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Podpis vytvořen "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[datum neudáno]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " pomocí certifikátu s ID 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"neplatný podpis: atribut otisku zprávy se neshoduje s vypočteným otiskem\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Dobrý podpis od"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " alias"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Toto je kvalifikovaný podpis\n"
@@@ -9708,112 -7693,84 +9699,112 @@@ msgstr "očekáván absolutní název s
msgid "looking up '%s'\n"
msgstr "hledá se „%s“\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "vypíše obsah CRL keše"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|stáhne CRL z URL"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "vypne dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "vyprázdní keš"
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "běží bez dotazování se uživatele"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "vynutí zavedení zastaralých CRL"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "povolí odesílání OCSP dotazů"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "zakáže použití HTTP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "zakáže použití LDAP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr "ignoruje HTTP distribuční místa CRL "
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr "ignoruje LDAP distribuční místa CRL"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|STROJ|pro LDAP dotazy použije STROJ"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "nepoužije náhradní stroje s --ldap-proxy"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "na seznam serverů přidá nové servery nalezené v místech distribuce CRL"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|nastaví časový limit pro LDAP na N sekund"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|použije OCSP odpovídače na URL"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|nevrací více jak N položek na jeden dotaz"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|SOUBOR|pro HKP přes TLS použije certifikáty CA ze SOUBORU"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr "směrovat veškerý síťový provoz skrz Tor"
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9822,11 -7779,9 +9813,11 @@@ msgstr "
"@\n"
"(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9834,78 -7789,61 +9825,78 @@@ msgstr "
"Syntaxe: @DIRMNGR@ [volby] [příkaz [argumenty]]\n"
"Přístup k serveru s klíči, CRL a OCSP z @GNUPG@\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "platné úrovně ladění jsou: %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "použití: %s [volby] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "stahování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "zpracování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: řádek je příliš dlouhý – přeskočen\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: zjištěn neplatný otisk\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: chyba čtení: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: nepořádek na konci řádku ignorován\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "přijat SIGHUP – konfigurace bude znovu načtena a keš vyprázdněna\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "přijat SIGTERM – vypíná se…\n"
# TODO: plural
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "vypnutí vynuceno\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "přijat SIGINT – okamžité vypnutí\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "přijat signál č. %d – žádná akce nedefinována\n"
@@@ -10075,7 -7977,14 +10066,18 @@@ msgstr "„%s“ není LDAP URL\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr "„%s“ není platné LDAP URL\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "chyba přístupu k „%s“: status HTTP %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "chyba při tisknutí řádku protokolu: %s\n"
@@@ -10140,12 -8037,10 +10142,12 @@@ msgstr "na seznam LDAP serverů se při
msgid "malloc failed: %s\n"
msgstr "funkce malloc selhala: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: chybný vzor „%s“\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search přesáhl omezení velikosti serveru\n"
@@@ -10205,12 -8088,6 +10207,7 @@@ msgstr "chyba při připojování na �
msgid "error reading HTTP response for '%s': %s\n"
msgstr "chyba při čtení HTTP odpovědi od „%s“: %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "chyba přístupu k „%s“: status HTTP %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "chyba při rozebírání OCSP odpovědi od „%s“: %s\n"
@@@ -10325,76 -8178,60 +10322,76 @@@ msgstr "OCSP odpovídač vrátil ne sou
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP odpovídač vrátil příliš starý stav\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "volání assuan_inquire(%s) selhalo: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "chybí ldapserver (LDAP server)"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "v ID certifikátu chybí serialno (sériové číslo)"
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "volání assuan_inquire selhalo: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "volání fetch_cert_by_url selhalo: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "volání start_cert_fetch selhalo: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "volání fetch_next_cert selhalo: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies (max. odpovědí) %d překročeno\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "řídící strukturu nelze alokovat: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "alokace kontextu assuan selhala: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "inicializace serveru selhala: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "registrace příkazu u Assuanu selhala: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problém příjmu Assuanu: %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@@ -10523,197 -8331,150 +10520,197 @@@ msgstr "odesílání řádku selhalo: %
msgid "error sending standard options: %s\n"
msgstr "chyba při odesílání standardního parametru: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Volby ovlivňující diagnostický výstup"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Volby ovlivňující nastavení"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Volby užitečné při ladění"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Volby ovlivňující bezpečnost"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|zahazovat klíče SSH po N sekundách"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|nastavit maximální životnost dočasné paměti pro PINy na N sekund"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N| nastavit maximální životnost klíčů SSH na N sekund"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Volby vynucující politiku hesel"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "nedovolit obejít politiku hesel"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|nastavit minimální vyžadovanou délku nových hesel na N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|vyžaduje alespoň N nepísmenných znaků v novém hesle"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|omezit platnost hesla na N dnů"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "nedovolit opakovat stará hesla"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set LDAP timeout to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|nastaví časový limit pro LDAP na N sekund"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NÁZEV|použít NÁZEV jako implicitní tajný klíč"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|JMÉNO|šifrovat rovněž pro uživatele s ID JMÉNO"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|nastavit e-mailový alias"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Nastavení serverů klíčů"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|používat server klíčů na URL"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "povolit dohledávání PKA (dotazy na DNS)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|METODA|používat METODU pro dohledávání klíčů podle e-mailové adresy"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "zakázat veškerý přístup k dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NÁZEV|používat kódování NÁZEV pro PKCS#12 hesla"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "neprověřovat kořenové certifikáty proti CRL"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Volby ovlivňující podobu výstupu"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Volby ovlivňující interaktivitu a vymáhání"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr "Volby ovlivňující použití Toru"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Nastavení HTTP serverů"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "používat systémové nastavení HTTP proxy"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Nastavení používaných LDAP serverů"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "Seznam LDAP serverů"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Nastavení OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
#, fuzzy
#| msgid "GPG for OpenPGP"
msgid "OpenPGP"
msgstr "GPG pro OpenPGP"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
#, fuzzy
#| msgid "Smartcard Daemon"
msgid "Smartcards"
msgstr "Démon pro čipové karty"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
#, fuzzy
#| msgid "GPG for S/MIME"
msgid "S/MIME"
msgstr "GPG pro S/MIME"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "chyba sítě"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "PIN and Passphrase Entry"
msgid "Passphrase Entry"
msgstr "Zadávání kódu PIN a hesla"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "Komponenta není vhodná pro spuštění"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Selhalo externí ověření komponenty %s"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Vezměte na vědomí, že určení skupiny se ignoruje\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing '%s': %s\n"
msgid "error closing '%s'\n"
msgstr "chyba při uzavírání „%s“: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error hashing '%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -10787,11 -8532,9 +10784,11 @@@ msgstr "použít jako výstupní soubor
msgid "activate changes at runtime, if possible"
msgstr "provést změny za běhu, pokud to lze"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Použití: @GPGCONF@ [volby] (-h pro nápovědu)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10799,15 -8542,12 +10796,15 @@@ msgstr "
"Syntaxe: @GPGCONF@ [volby]\n"
"Spravuje konfigurační volby nástrojů, které patří do systému @GNUPG@\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Potřebuji jeden argument určující komponentu"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Komponenta nenalezena"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Žádné argumenty nejsou povoleny"
diff --cc po/da.po
index c9f55bd,3d42b7c..ce27009
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -24,7 -23,6 +24,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "kunne ikke indhente pinentry-lås: %s\n"
@@@ -35,47 -33,38 +35,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "_O.k."
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "_Afbryd"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
msgstr "_O.k."
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
msgstr "_O.k."
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
#, fuzzy
#| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
msgstr "_Afbryd"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "Enter new passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "Indtast ny adgangsfrase
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Kvalitet:"
@@@ -93,7 -81,6 +93,7 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@@ -102,7 -89,6 +102,7 @@@
"specialtegn. Spørg din administrator om mere præcis information om\n"
"hvordan man anvender sikre adgangskoder."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -110,7 -96,6 +110,7 @@@ msgstr "
"Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
"session"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -118,53 -103,40 +118,53 @@@ msgstr "
"Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
"session"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Adgangsfrase:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "matcher ikke - prøv igen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (forsøg %d af %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "PIN er for lang"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Adgangsfrase er for lang"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Ugyldige tegn i PIN"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "PIN er for kort"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Ugyldig PIN"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Ugyldig adgangsfrase"
@@@ -173,60 -144,38 +173,60 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "detekteret kort med S/N: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "ingen egnet kortnøgle fundet: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Tillad"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Nægt"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Genindtast venligst denne adgangsfrase"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -261,63 -205,49 +261,63 @@@ 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:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Indsæt venligst kortet med serielnummeret"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Fjern venligst det aktuelle kort og indsæt det med serielnummeret"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Administrator-PIN"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Nulstillingskode"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0ABrug læserens numeriske tastatur for indtastning."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Gentag denne nulstillingskode"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Gentag denne PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Gentag denne PIN"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Nulstillingskode er ikke korrekt gentaget; prøv igen"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK er ikke korrekt gentaget; prøv igen"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN er ikke korrekt gentaget; prøv igen"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Indtast venligst PIN'en%s%s%s for at låse kortet op"
@@@ -418,8 -335,6 +418,8 @@@ msgstr "Indtast venligst adgangsfrasen
msgid "Please enter the new passphrase"
msgstr "Indtast venligst den nye adgangsfrase"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -427,144 -342,108 +427,148 @@@ msgstr "
"@Indstillinger:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "kør i dæmontilstand (baggrunden)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "kør i servertilstand (forgrunden)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "kør i servertilstand"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "uddybende"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "vær mindre uddybende"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "kommandoresultat i sh-stil"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "kommandoresultat i csh-stil"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FIL|læs tilvalg fra FIL"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "frakobl ikke fra konsollen"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "fang ikke tastatur og mus"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "brug en logfil for serveren"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|brug PGM som PIN-Entry-program"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|brug PGM som SCdaemon-program"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "brug ikke SCdaemon'en"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|forbind til Assuansokkel NAVN"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ignorer forespørgsler om at ændre TTY'en"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ignorer forespørgsler om at ændre X-skærmen"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "brug ikke PIN-mellemlageret når der underskrives"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "tillad ikke genbrug af gamle adgangsfraser"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "tillad forhåndsindstilling af adgangsfrase"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktiver ssh-agent-emulering"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -576,157 -455,123 +580,162 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "valgt sammendragsalgoritme er ugyldig\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette sokkel: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
msgstr "sokkelnavnet »%s« er for langt\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "en gpg-agent kører allerede - starter ikke en ny\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "fejl ved indhentelse af nonce for soklen\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "fejl ved binding af sokkel til »%s«: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() mislykkedes: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
msgstr "lytter på sokkel »%s«\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
msgstr "mappe »%s« oprettet\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
#| msgid "stat() failed for `%s': %s\n"
msgid "stat() failed for '%s': %s\n"
msgstr "stat() mislykkedes for »%s«: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
#| msgid "can't use `%s' as home directory\n"
msgid "can't use '%s' as home directory\n"
msgstr "kan ikke bruge »%s« som hjemmemappe\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fejl ved læsning af nonce på fd %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "håndtering 0x%lx for fd %d startet\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "håndtering 0x%lx for fd %d termineret\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh-håndtering 0x%lx for fd %d startet\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh-håndtering 0x%lx for %d termineret\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, 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:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Brug: gpg-preset-passphrase [tilvalg] KEYGRIP (-h for hjælp)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -734,8 -579,6 +743,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
"Adgangskode for mellemlagervedligeholdelse\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -743,9 -586,6 +752,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -802,8 -634,6 +811,8 @@@ msgstr "afbrudt\n
msgid "error while asking for the passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -870,8 -691,6 +879,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Nej"
@@@ -925,7 -737,6 +934,7 @@@ msgstr "Ændr adgangsfrasen
msgid "I'll change it later"
msgstr "Jeg ændrer den senere"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -933,13 -744,11 +942,13 @@@
"%%0A?"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "aktiver nøgle"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -960,7 -766,6 +969,7 @@@ msgstr "%s-nøglen bruger en usikker (%
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
@@@ -1002,8 -797,6 +1011,8 @@@ msgstr "fejl ved oprettelse af datakana
msgid "error creating a stream for a pipe: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "fejl ved forgrening af proces: %s\n"
@@@ -1135,7 -902,6 +1144,7 @@@ msgstr "ikke nok kerne i sikker hukomme
msgid "out of core while allocating %lu bytes"
msgstr "ikke nok kerne under allokering af %lu byte"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "fejl ved allokering af nok hukommelse: %s\n"
@@@ -1151,7 -915,6 +1160,7 @@@ msgstr "%s:%u: forældet indstilling »
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1263,8 -1003,6 +1272,8 @@@ msgstr "Sessionsnøgle oprettet
msgid "algorithm: %s"
msgstr "algoritme: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "ikke understøttet algoritme: %s"
@@@ -1433,7 -1133,6 +1442,7 @@@ msgstr "ugyldig indstilling
msgid "missing argument for option \"%.50s\"\n"
msgstr "manglende parameter for indstilling »%.50s«\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "invalid argument for option \"%.50s\"\n"
@@@ -1459,7 -1154,6 +1468,7 @@@ msgstr "tilvalg »%.50s« er tvetydigt\
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommando »%.50s« er tvetydig\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "uden for kerne\n"
@@@ -1522,8 -1205,6 +1531,8 @@@ msgstr "lås »%s« er ikke udført: %s
msgid "waiting for lock %s...\n"
msgstr "venter på lås %s ...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s er for gammel (kræver %s, har %s)\n"
@@@ -1652,7 -1307,6 +1661,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "ADVARSEL: Ingen notationsdata fundet\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "kunne ikke proxy %s-forespørgsel til klient\n"
@@@ -1663,35 -1316,33 +1672,42 @@@
msgid "Enter passphrase: "
msgstr "Indtast adgangsfrase\n"
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s virker endnu ikke med %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort er ikke tilgængeligt: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnr. %s detekteret\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "kan ikke udføre dette i jobtilstand\n"
@@@ -1699,14 -1349,9 +1715,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Nulstillingskode er ikke eller ikke mere tilgængelig\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Dit valg? "
@@@ -1763,92 -1395,57 +1779,77 @@@ msgstr "Fejl: Kombineret navn er for la
msgid "URL to retrieve public key: "
msgstr "Adresse hvor offentlig nøgle skal hentes: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "fejl ved læsning af »%s«: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "fejl ved skrivning af »%s«: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Loginddata (kontonavn): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Fejl: Loginddata er for lange (begrænsningen er %d tegn).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
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 "Fejl: Privat DO er for lang (begrænsningen er %d tegn).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Sprogpræferencer: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Fejl: ugyldig længde for præferencestreng.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Køn ((M)and, Kvinde(F) eller mellemrum): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Fejl: ugyldigt svar.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "CA-fingeraftryk: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "nøglehandling er ikke mulig: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Erstat eksisterende nøgle? (j/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1864,58 -1461,46 +1865,58 @@@ msgstr "
" dokumentationen for dit kort for at se hvilke størrelser, der\n"
" er tilladt.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for underskriftsnøglen (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for krypteringsnøglen? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for godkendelsesnøglen? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "afrundet op til %u bit\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "fejl ved ændring af størrelsen på nøglen %d til %u bit: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Lav sikkerhedskopi et andet sted end på kortet for krypteringsnøglen? (J/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Erstat eksisterende nøgler (j/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1930,169 -1515,125 +1931,169 @@@ msgstr "
" PIN = »%s« Admin-PIN = »%s«\n"
"Du bør ændre dem med kommandoen --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Vælg venligst hvilken slags nøgle der skal oprettes:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Underskriftsnøgle\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsnøgle\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Godkendelsesnøgle\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Ugyldigt valg.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "læsning mislykkedes: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "afslut denne menu"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "vis administratorkommandoer"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "vis denne hjælpetekst"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "vis alle tilgængelige data"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "ændr kortholders navn"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "ændr adresse for at indhente nøgle"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "hent nøglen angivet i kortadressen"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "ændr logindnavnet"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "ændr sprogpræferencerne"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "ændr kortholders køn"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "ændr et CA-fingeraftryk"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "skift force PIN-flag for underskriften"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "opret nye nøgler"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "menu til at ændre eller fjerne blokering for PIN'en"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "verificer PIN'en og vis alle data"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "fjern blokering for PIN'en med en nulstillingskode"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Kommandoer kun for administratoren\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Administratorkommandoer er tilladt\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Administratorkommandoer er ikke tilladt\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (prøv »help«)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommando\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fejl ved læsning af nøgleblok: %s\n"
@@@ -2153,39 -1682,32 +2154,39 @@@ msgstr "der er en hemmelig nøgle for o
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "brug tilvalget »--delete-secret-keys« for at slette den først.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "kan ikke bruge en symmetrisk ESK-pakke på grund af S2K-tilstanden\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "bruger chiffer %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "»%s« allerede komprimeret\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ADVARSEL: »%s« er en tom fil\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "læser fra »%s«\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2193,7 -1715,16 +2194,20 @@@ msgstr "
"ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
"præferencer\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2202,40 -1733,34 +2216,41 @@@ msgstr "
"ADVARSEL: Tvang for komprimeringsalgoritme %s (%d) overtræder modtagerens "
"præferencer\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypteret 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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "du kan ikke bruge %s i tilstanden %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterede data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krypteret med ukendt algoritme %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ADVARSEL: Besked blev krypteret med en svag nøgle i den symmetriske "
"chiffer.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problem ved håndtering af krypteret pakke\n"
@@@ -2321,39 -1829,30 +2336,39 @@@ msgstr "fjern så meget som muligt fra
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: udelod: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "skriver til »%s«\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "nøgle %s: nøgle i PGP 2.x-stil - udeladt\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2425,225 -1911,178 +2440,231 @@@ msgstr "|NAME|brug NAVN som hemmelig st
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "opret en underskrift"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "opret en underskrift i klartekst"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "opret en separat underskrift"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "krypter kun med symmetrisk chiffer"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "afkrypter data (standard)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "godkend en underskrift"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "vis nøgler"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "vis nøgler og underskrifter"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "vis og kontroller nøgleunderskrifter"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "vis nøgler og fingeraftryk"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "vis hemmelige nøgler"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "opret et tilbagekaldscertifikat"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "fjern nøgler fra den offentlige nøglering"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "fjern nøgler fra den hemmelige nøglering"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "underskriv eller rediger en nøgle"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "ændr en adgangsfrase"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "eksporter nøgler"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "eksporter nøgler til en nøgletjener"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importer nøgler fra en nøgleserver"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "søg efter nøgler på en nøgleserver"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "opdater alle nøgler fra en nøgleserver"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importer/sammenføj nøgler"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "udskriv kortstatus"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "ændr data på et kort"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "ændr et korts PIN"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "opdater troværdighedsdatabasen"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "vis beskedsammendrag"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "kør i servertilstand"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "opret ascii-pansrede uddata"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|krypter for BRUGER-ID"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "brug kanonisk teksttilstand"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv resultat til FIL"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "lav ingen ændringer"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "spørg før overskrivning"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "brug streng OpenPGP-opførsel"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2651,7 -2090,6 +2672,7 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2681,14 -2119,12 +2702,14 @@@ msgstr "
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2703,7 -2139,6 +2724,7 @@@ msgstr "
"Sign, check, encrypt eller decrypt\n"
"standardhandling afhænger af inddata\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2711,81 -2146,66 +2732,81 @@@ msgstr "
"\n"
"Understøttede algoritmer:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "brug: gpgsm [tilvalg] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "kommandoer er i konflikt\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2794,19 -2214,16 +2815,19 @@@ msgid "
msgstr ""
"ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2816,461 -2233,347 +2837,442 @@@ msgid "
msgstr ""
"ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "ukendt konfigurationspunkt »%s«\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "vis billed-id'er under nøglevisninger"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, 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:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "vil politikadresser under underskriftvisninger"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "vis alle notationer under underskriftvisninger"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotationer under underskriftvisninger"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "vis brugerangivne notationer under underskriftvisninger"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
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:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "vis nøgleringsnavnet i nøglevisninger"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "vis udløbsdatoer under underskriftvisninger"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, 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:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke fortolke nøgleserveradresse\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importindstillinger\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "ugyldige importindstillinger\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listeindstillinger\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "vis billed-id'er under underskriftverificering"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "vis politikadresser under underskriftverificering"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "vis alle notationer under underskriftverificering"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotationer under underskriftverificering"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "vis brugerangivne notationer under underskriftverificering"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "vis bruger-id-validitet under underskriftverificering"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr "vis kun den primære bruger-id i underskriftverificering"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "valider underskrifter med PKA-data"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke angive kørselssti til %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kører med forfalsket systemtid: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed skal være større end 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed skal være større end 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "ugyldige standardpræferencer\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ugyldige præferencer for personlig chiffer\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ugyldige præferencer for personlig sammendrag\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ugyldige præferencer for personlig komprimering\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, 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"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "du må ikke bruge komprimeringsalgoritmen »%s« i tilstanden %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, 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:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "du kan ikke bruge --symmetric --encrypt i tilstanden %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nøgleserver send mislykkedes: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nøgleserver modtag mislykkedes: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nøgleserver søg mislykkedes: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "nøgleserver opdater mislykkedes: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af panser mislykkedes: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Gå til sagen og skriv meddelelsen ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@@ -3282,7 -2583,6 +3284,7 @@@ msgstr "|FILE|tag nøglerne fra nøgler
msgid "make timestamp conflicts only a warning"
msgstr "giv kun tidsstempelkonflikter en advarsel"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation til denne FD"
@@@ -3312,144 -2607,120 +3314,150 @@@ msgstr "Ingen hjælp tilgængelig
msgid "No help available for '%s'"
msgstr "Ingen hjælp tilgængelig for »%s«"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "importer underskrifter som er markeret som local-only"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "reparer skade fra pks-nøgleserveren under import"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "opdater ikke trustdb efter import"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "opdater ikke trustdb efter import"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "vis nøglefingeraftryk"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "accepter kun opdateringer til eksisterende nøgler"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "fjern ubrugelige dele fra nøgle efter import"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "fjern så meget som muligt fra nøgle efter import"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "antag inddata er i binært format"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "vis nøglefingeraftryk"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr " udelader bloktype %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr " %lu-nøgler behandlet\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Totalt antal behandl.: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " udeladte nye nøgler: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " udeladte nye nøgler: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " w/o bruger-id'er: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerede: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " uændrede: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruger-id'er: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undernøgler: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye underskrifter: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye nøgletilbagekald: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " hemmelige nøgler læst: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " hemmel. nøgler import: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "hemmel. nøgler uændret: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importerede: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " underskrifter ryddet: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " bruger-id'er ryddet: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3458,194 -2729,156 +3466,194 @@@ msgstr "
"ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
"algoritmer på disse bruger-id'er:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " »%s«: præference for chifferalgoritme %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " »%s«: præference for sammendragsalgortime %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " »%s«: præference for komprimeringsalgortime %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "det anbefales på det stærkeste, at du opdaterer dine præferencer og\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"gendistribuerer denne nøgle for at undgå potentielle problemer med rod i\n"
"algoritmen\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "du kan opdatere dine præferencer med: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "nøgle %s: ingen bruger-id\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nøgle %s: korruption af PKS-undernøgle er repareret!\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nøgle %s: accepteret ikke egenunderskrevet bruger-id »%s«\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende egenunderskrift\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nøgle %s: ny nøgle - udeladt\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbar nøglering fundet: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "fejl ved skrivning af nøglering »%s«: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nøgle %s: stemmer ikke med vores kopi\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nøgle %s: »%s« %d nye bruger-id'er\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nøgle %s: »%s« 1 ny underskrift\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nøgle %s: »%s« %d nye underskrifter\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nøgle %s: »%s« %d nye undernøgler\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nøgle %s: »%s« %d underskrift renset\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nøgle %s: »%s« %d underskrifter renset\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nøgle %s: »%s« %d bruger-id renset\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nøgle %s: »%s« %d bruger-id'er renset\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nøgle %s: »%s« ikke ændret\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nøgle %s: hemmelig nøgle importeret\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "udelod: hemmelig nøgle er allerede til stede\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "import af hemmelige nøgler er ikke tilladt\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "nøgle %s: hemmelig nøgle med ugyldig chiffer %d - udeladt\n"
@@@ -3660,142 -2893,115 +3668,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"nøgle %s: ingen offentlig nøgle - kan ikke anvende tilbagekaldscertifikat\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nøgle %s: ingen bruger-id for underskrift\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nøgle %s: ikke understøttet offentlig nøglealgoritme på bruger-id »%s«\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nøgle %s: ugyldig egenunderskrift på bruger-id »%s«\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nøgle %s: ingen undernøgle for nøglebinding\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nøgle %s: ugyldig undernøglebinding\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nøgle %s: fjernet flerundernøglebinding\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nøgle %s: ingen undernøgle for nøgletilbagekald\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nøgle %s: udeladt bruger-id »%s«\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nøgle %s: udeladt undernøgle\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"nøgle %s: underskrift der ikke kan eksporteres (klasse 0x%02X) - udeladt\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "nøgle %s: tilbagekaldscertifikat på forkert sted - udeladt\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "nøgle %s: undernøgleunderskrift på forkert sted - udeladt\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nøgle %s: uventet underskriftklasse (0x%02X) - udeladt\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: nøgle %s kan tilbagekaldes: henter tilbagekaldsnøgle %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ADVARSEL: nøgle %s kan tilbagekaldes: tilbagekaldsnøgle %s er ikke til "
"stede.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
@@@ -3841,86 -3040,12 +3849,15 @@@ msgstr "fejl ved åbning af »%s«: %s\
msgid "failed to rebuild keyring cache: %s\n"
msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[tilbagekald]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[egenunderskrift]"
- #: 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"
- msgstr "fejl ved allokering af nok hukommelse: %s\n"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "Good signature from"
- msgid " (reordered signatures follow)"
- msgstr "God underskrift fra"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
- msgid "key %s:\n"
- msgstr "udelod »%s«: %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
- msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
- msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d ugyldige underskrifter\n"
- msgstr[1] "%d ugyldige underskrifter\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "God underskrift fra"
- msgstr[1] "God underskrift fra"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3931,17 -3056,14 +3868,17 @@@ msgstr "
"andre brugers nøgler\n"
"(ved at kigge på pas, kontrollere fingeraftryk fra andre kilder etc.)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Marginal troværdighed\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Fuld troværdighed\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3951,52 -3073,40 +3888,52 @@@ msgstr "
"En dybde større end 1 giver nøglen du underskriver mulighed for\n"
"at lavet troværdighedsunderskrifter på dine vegne.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Indtast venligst et domæne for at begrænse denne underskrift, eller retur "
"for ingen.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Bruger-id »%s« er tilbagekaldt."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Er du sikker på, at du stadig vil underskrive (j/N) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Kunne ikke underskrive.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Bruger-id »%s« er udløbet."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Bruger-id »%s« er ikke egenunderskrevet."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Bruger-id »%s« kan underskrives. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4005,11 -3115,9 +3942,11 @@@ msgstr "
"Egenunderskriften på »%s«\n"
"er en underskrift i PGP 2.x-stil.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Ønsker du at forfremme den til en OpenPGP-egenunderskrift? (j/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4018,12 -3126,10 +3955,12 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er udløbet.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Ønsker du at udstede en ny underskrift for at erstatte den udløbne? (j/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4032,45 -3138,36 +3969,45 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er en lokal underskrift.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Ønsker du at forfremme den til en fuld underskrift, der kan eksporteres (j/"
"N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "»%s« var allerede underskrevet lokalt af nøgle %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "»%s« var allerede underskrevet af nøgle %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ønsker du at underskrive den igen alligevel? (j/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Intet at underskrive med nøgle %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Denne nøgle er udløbet!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denne nøgle er ved at udløbe på %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Ønsker du at dine underskrifter skal udløbe på samme tidspunkt? (J/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4081,33 -3178,27 +4018,33 @@@ msgstr "
"faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
"indtast »0«.\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jeg har ingen kontrol udført.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jeg har udført en overfladisk kontrol.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Jeg har foretaget en meget omhyggelig kontrol.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Dit valg? (indtast »?« for yderligere information): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4116,233 -3207,179 +4053,233 @@@ msgstr "
"Er du sikker på, at du ønsker at underskrive denne nøgle\n"
"med din nøgle »%s« (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Dette vil være en egenunderskrift.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"ADVARSEL: Underskriften vil ikke blive markeret som ikke at kunne "
"eksporteres.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"ADVARSEL: Underskriften vil ikke blive markereret som ikke at kunne "
"tilbagekaldes.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne eksporteres.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne tilbagekaldes.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Jeg har overhovedet ikke kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Underskriv? (j/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "underskrift mislykkedes: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Nøgle har kun stump eller ikkekort nøgleposter - ingen adgangsfrase at "
"ændre.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "gem og afslut"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "vis nøglefingeraftryk"
# key grip
# chiefly ( US ) See also grip the person in charge of moving and setting up camera
# tracks and scenery in a film or television studio
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Indtst nøglegrebet: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "vis nøgle og bruger-id'er"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "vælg bruger-id N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "vælg undernøgle N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "kontroller underskrifter"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"underskriv valgte bruger-id'er [* se nedenfor for relaterede kommandoer]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "underskriv valgte bruger-id'er lokalt"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "underskriv valgte bruger-id'er med en troværdighedsunderskrift"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "underskriv bruger-id'er md en underskrift der ikke kan kaldes tilbage"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "tilføj bruger-id"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "tilføj billed-id"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "slet valgte bruger-id'er"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "tilføj en undernøgle"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "tilføj en nøgle til et smartkort"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "flyt en nøgle til et smartkort"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "flyt en sikkerhedskopinøgle til et smartkort"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "slet valgte undernøgler"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "tilføj en tilbagekaldsnøgle"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "slet underskrifter fra de valgte bruger-id'er"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "ændr udløbsdatoen for nøglen eller valgte undernøgler"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "marker den valgte bruger-id som primær"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "vis præferencer (ekspert)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "vis præferencer (uddybende)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "angiv præferenceliste for de valgte bruger-id'er"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "angiv den foretrukne nøgleserveradresse for de valgte bruger-id'er"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "angiv en notation for de valgte bruger-id'er"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "ændr adgangsfrasen"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "ændr ejertroværdigheden"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "tilbagekald valgte bruger-id'er"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "tilbagekald nøgle eller valgte undernøgler"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "aktiver nøgle"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "deaktiver nøgle"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "vis valgte billed-id'er"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"komprimer ubrugelige bruger-id'er og fjern ubrugelige underskrifter fra nøgle"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"komprimer ubrugelige bruger-id'er og fjern alle underskrifter fra nøgle"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Hemmelig nøgle er tilgængelig.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Har brug for den hemmelige nøgle for dette.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4363,287 -3400,235 +4300,299 @@@ msgstr "
"tnrsign\n"
" etc.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Nøglen er tilbagekaldt."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Ukendt underskrifttype »%s«\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Du skal vælge mindst en bruger-id.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Du kan ikke slette den sidste bruger-id!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Vil du virkelig fjerne alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Vil du virkelig fjerne denne bruger-id? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Du skal vælge præcis en nøgle.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Kommando forventer en filnavnsparameter\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Kan ikke åbne »%s«: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Fejl ved læsning af sikkerhedskopinøgle fra »%s«: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Du skal vælge mindst en nøgle.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vil du virkelig slette denne nøgle? (j/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Vil du virkelig tilbagekalde alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Vil du virkelig tilbagekalde dette bruger-id? (j/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vil du virkelig tilbagekalde hele nøglen? (j/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vil du virkelig tilbagekalde de valgte undernøgler? (j/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vil du virkelig tilbagekalde denne undernøgle? (j/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Ejertroværdighed kan ikke indstilles, når der bruges en brugerleveret "
"troværdighedsdatabase\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Angiv præferenceliste til:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Opdater præferencerne for de valgte bruger-id'er (j/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Opdater præferencerne? (j/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Gem ændringer? (j/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Afslut uden at gemme? (j/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "opdatering mislykkedes: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Du kan ikke slette den sidste bruger-id!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ugyldig fingeraftryk"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "kunne ikke indhente fingeraftrykket\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "ugyldig værdi\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan bruger-id.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Intet at underskrive med nøgle %s\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "invalid fingerprint"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "ugyldig fingeraftryk"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "nøglen »%s« blev ikke fundet: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Sammendrag: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Nøgleserver no-modify"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Fortrukken nøgleserver: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Der er ingen præferencer på en bruger-id i PGP 2.x-stil.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Den følgende nøgle blev tilbagekaldt den %s af %s nøgle %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Denne nøgle er tilbagekaldt af %s nøgle %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "oprettet: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "tilbagekaldt: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "udløbet: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "udløber: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "brug: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "kortnr.: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "troværdighed: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "validitet: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Denne nøgle er blevet deaktiveret"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4651,18 -3636,12 +4600,18 @@@ msgstr "
"Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
"korrekt med mindre du genstarter programmet.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "udløbet"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4670,17 -3649,14 +4619,17 @@@ msgstr "
"ADVARSEL: Intet bruger-id er blevet markeret som primær. Denne kommando\n"
" kan medføre at et anden bruger-id bliver den formodede primære.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4690,35 -3666,27 +4639,35 @@@ msgstr "
"medføre at\n"
" nogle version af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du må ikke tilføje et billed-id til en nøgle i PGP2-stil.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Slet denne gode underskrift? (j/N/a)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Slet denne ugyldige underskrift? (j/N/a)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Slet denne ukendte underskrift? (j/n/a)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Virkelig slette denne egenunderskrift? (j/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4726,20 -3694,16 +4675,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Slettede %d underskrift.\n"
msgstr[1] "Slettede %d underskrift.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Intet slettet.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Bruger-id »%s« komprimeret: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4747,17 -3711,14 +4696,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Bruger-id »%s«: allerede minimeret\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Bruger-id »%s«: allerede ryddet\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4767,41 -3728,33 +4716,41 @@@ msgstr "
"tilbagekalder\n"
" kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Du må ikke tilføje en dedikeret tilbagekalder til en nøgle i PGP 2.x-stil.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "kan ikke udpege en nøgle i PGP 2.x-stil som dedikeret tilbagekalder\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "du kan ikke udpege en nøgle som dets egen dedikerede tilbagekalder\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "denne nøgle er allerede blevet dedikeret som en tilbagekalder\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"ADVARSEL: Udpegning af en nøgle som en dedikeret tilbagekalder kan ikke "
"fortrydes!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
"tilbagekalder? (j/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4812,174 -3765,142 +4761,180 @@@ msgstr "
"Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
"tilbagekalder? (j/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"undernøgle %s underskriver ikke og skal derfor ikke være krydscertificeret\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Vælg venligst præcis en bruger-id.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Indtast din foretrukne nøglerserveradresse: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Er du sikker på, at du ønsker at erstatte den? (j/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Er du sikker på, at du ønsker at slette den? (j/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Indtast notationen: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Fortsæt? (j/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen bruger-id med hash %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "Ingen undernøgle med indeks %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernøgle med indeks %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "bruger-id: »%s«\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "underskrevet af din nøgle %s den %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (kan ikke eksporteres)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne underskrift udløb den %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Er du sikker på, at du ønsker at tilbagekalde den? (j/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Ikke underskrevet af dig.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Du har underskrevet disse bruger-id'er på nøgle %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (kan ikke tilbagekaldes)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "tilbagekaldt af din nøgle %s på %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "ingen hemmelig nøgle\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"ADVARSEL: En bruger-id-underskrift er dateret %d sekunder inde i fremtiden\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Du kan ikke slette den sidste bruger-id!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Viser %s billed'id med størrelse %ld for nøgle %s (uid %d)\n"
++#: g10/keygen.c: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/keygen.c:317
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
@@@ -5427,8 -4271,6 +5382,8 @@@ msgstr "
"under oprettelse af primtallet; dette giver det vilkårlig\n"
"taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nøgleoprettelse mislykkedes: %s\n"
@@@ -5505,7 -4334,6 +5460,7 @@@ msgstr "fejl ved skrivning af offentli
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5513,7 -4341,6 +5468,7 @@@ msgstr "
"Bemærk at denne nøgle ikke kan bruges til kryptering. Du kan bruge\n"
"kommandoen »--edit-key« til at oprette en undernøgle til dette formål.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5521,7 -4348,6 +5476,7 @@@ msgstr "
"nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5529,50 -4355,39 +5484,50 @@@ msgstr "
"nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BEMÆRK: Oprettelse af undernøgler for v3-nøgler overholder ikke OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige dele for primær nøgle er ikke tilgængelige.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemmelige dele for primær nøgle gemmes på kortet.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette? (j/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "aldrig "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritisk underskriftspolitik: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Underskriftspolitik: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Kritisk foretrukken nøgleserver: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kritisk underskriftnotation: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Underskriftsnotation: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5580,7 -4395,20 +5535,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d ugyldige underskrifter\n"
msgstr[1] "%d ugyldige underskrifter\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d ugyldige underskrifter\n"
+ msgstr[1] "%d ugyldige underskrifter\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
+ msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5588,40 -4416,32 +5559,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
msgstr[1] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Nøglering"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Undernøglefingeraftryk:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Undernøglefingeraftryk:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Nøglefingeraftryk ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Serielnr. for kort ="
@@@ -5731,265 -4530,217 +5702,272 @@@ msgstr "nøgle blev ikke fundet på nø
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen kendt nøgleserver (brug tilvalget --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "anmoder om nøgle %s fra %s server %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "anmoder om nøgle %s fra %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "ingen nøgleserverhandling!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "sender nøgle %s til %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "anmoder om nøgle %s fra %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "underlig størrelse for en krypteret sessionsnøgle (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s krypteret sessionsnøgle\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "adgangsfrase oprettet med ukendt sammendragsalgoritme %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "offentlig nøgle er %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "krypterede data for offentlig nøgle: god DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "krypteret med %u-bit %s nøgle, id %s, oprettet %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " »%s«\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "krypteret med %s nøgle, id %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "krypteret med %lu adgangsfraser\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "krypteret med 1 adgangsfrase\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "antager %s krypterede data\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA-chiffer utilgængelig, forsøger optimistisk at bruge %s i stedet for\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "afkryptering okay\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "afkryptering mislykkedes: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "BEMÆRK: afsender anmodte om »for-your-eyes-only«\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "oprindeligt filnavn=»%.*s«\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "ADVARSEL: flere klartekster set\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "ingen underskrift fundet\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "UGYLDIG underskrift fra »%s«"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Udløbet underskrift fra »%s«"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "God underskrift fra »%s«"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "underskriftverificering undertrykt\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Underskrift lavet %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " bruger %s nøgle %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Underskrift lavet %s med %s nøgle-id %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " også kendt som »%s«"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Nøgle tilgængelig på: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " også kendt som »%s«"
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "ADVARSEL: Denne nøgle er ikke certificeret med en troværdig underskrift!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Underskrift udløbet %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Underskrift udløber %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s underskrift, sammendragsalgoritme %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binær"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "tekstilstand"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "ukendt"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritme: %s"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ikke kontrollere underskrift: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "ikke en frakoblet underskrift\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
"kontrolleret.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "uafhængig underskrift for klasse 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) underskrift\n"
@@@ -6050,72 -4790,59 +6028,72 @@@ msgstr "læsefejl i »%s«: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: forældet indstilling »%s«\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "brug venligst »%s%s« i stedet for\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Ukomprimeret"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "ukomprimeret|ingen"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydigt tilvalg »%s«\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
#, 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:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6643,36 -5271,34 +6621,42 @@@ msgstr "kan ikke åbne underskrevne dat
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan ikke åbne underskrevne data fd=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "certifikat kan ikke bruges til kryptering\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonym modtager; prøver hemmelig nøgle %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "okay, vi er den anonyme modtager.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "gammel kodning for DEK'en er ikke understøttet\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "chifferalgoritme %d%s er ukendt eller deaktiveret\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "ADVARSEL: chifferalgoritme %s ikke fundet i modtagerpræferencer\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "BEMÆRK: hemmelig nøgle %s udløb den %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6833,7 -5431,6 +6817,7 @@@ msgstr "(Ingen beskrivelse angivet)\n
msgid "Is this okay? (y/N) "
msgstr "Er dette okay? (j/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "svag nøgle oprettet - prøver igen\n"
@@@ -6854,27 -5448,27 +6838,33 @@@ msgstr "%s-nøglen bruger en usikker (%
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA-nøgle %s kræver en %u bit eller større hash\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "ADVARSEL: konflikt for underskriftssammendrag i besked\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "du kan ikke bruge %s i tilstanden %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "ADVARSEL: underskriftsundernøgle %s er ikke krydscertificeret\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "se venligst %s for yderligere information\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"ADVARSEL: underskriftsundernøgle %s har en ugyldig krydscertificering\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6882,7 -5476,6 +6872,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6890,7 -5483,6 +6880,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6905,7 -5497,6 +6895,7 @@@ msgstr[1] "
"nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
"problem med uret)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6919,42 -5510,35 +6909,42 @@@ msgstr[1] "
"nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
"problem med uret)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "BEMÆRK: underskriftnøgle %s udløb %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "BEMÆRK: underskriftnøgle %s er blevet tilbagekaldt\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"antager ugyldig underskrift fra nøgle %s på grund af en ukendt kritisk del\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"nøgle %s: ingen undernøgle til tilbagekaldsunderskrift for undernøgle\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "nøgle %s: ingen undernøgle til bindingsunderskrift for undernøgle\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"ADVARSEL: kan ikke %%-udvide notation (for stor). Bruger uden udvidelse.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6962,7 -5546,6 +6952,7 @@@ msgstr "
"ADVARSEL: kan ikke %%-udvide politikadresse (for stor). Bruger uden "
"udvidelse.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6971,12 -5554,10 +6961,12 @@@ msgstr "
"ADVARSEL: kan ikke %%-udvide foretrukken nøgleserveradresse (for stor). "
"Bruger uden udvidelse.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s-underskrift fra: »%s«\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6984,30 -5565,24 +6974,30 @@@ msgstr "
"ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
"modtagerpræferencer\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "underskriver:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s-kryptering vil blive brugt\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "udelod »%s«: duplikeret\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "udelod: hemmelig nøgle er allerede til stede\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"dette er en PGP-oprettet Elgamalnøgle som ikke er sikker for underskrifter!"
@@@ -7096,7 -5655,6 +7086,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7208,149 -5744,121 +7198,149 @@@ msgstr "kan ikke håndtere tekstlinjer
msgid "input line longer than %d characters\n"
msgstr "inddatalinje er længere end %d tegn\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "fejl under afsendelse af standardtilvalg: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "ikke understøttet algoritme: %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: fejl ved skrivning af mappepost: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "fejl ved åbning af »%s«: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validitet: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, 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:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vis nøgler"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7358,7 -5866,6 +7348,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7366,7 -5873,6 +7356,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "krypteret med %lu adgangsfraser\n"
msgstr[1] "krypteret med %lu adgangsfraser\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7374,7 -5880,6 +7364,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7382,54 -5887,46 +7372,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7438,108 -5935,90 +7428,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, 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:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, 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:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Slettede %d underskrifter.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7547,13 -6026,11 +7537,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "krypteret med %lu adgangsfraser\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7561,31 -6038,25 +7551,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "validitet: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7602,19 -6073,15 +7592,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, 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:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7857,19 -6279,14 +7847,19 @@@ msgstr "
"Syntaks: kbxutil [tilvalg] [filer]\n"
"Vis, eksporter, importer Keybox-data\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA-modulus mangler eller har ikke størrelsen %d bit\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA offentlig eksponent mangler eller større end %d bit\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-tilbagekald returnerede fejl: %s\n"
@@@ -7923,44 -6331,35 +7913,44 @@@ msgstr "
"|P|Indtast venligst PIN Unblocking Code (PUK) for nøglen til at oprette "
"kvalificerede underskrifter."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "fejl ved indhentelse af ny PIN: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "kunne ikke gemme fingeraftrykket: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "fejl ved indhentelse af CHV-status fra kort\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "svar indeholder ikke RSA modulus'erne\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public key\n"
msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "svar indeholder ikke data for offentlig nøgle\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
@@@ -7968,57 -6367,46 +7958,57 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "bruger standard-PIN som %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"kunne ikke bruge standard-PIN som %s: %s - deaktiverer yderligere "
"standardbrug\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Indtast venligst PIN'en"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN for CHV%d er for kort; minimumlængde er %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verificering af CHV%d mislykkedes: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "kort er permanent låst!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -8029,23 -6417,18 +8019,23 @@@ msgstr[1] "%d PIN-forsøg for administr
#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
#. the start of the string. Use %0A (single percent) for a linefeed.
- #: scd/app-openpgp.c:2243
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Indtast venligst administrator-PIN'en"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Indtast venligst PIN'en"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Indtast venligst nulstillingskoden for kortet"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@@ -8053,79 -6436,61 +8043,79 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Ny nulstillingskode"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny administrator-PIN"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Ny PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Indtast venligst PIN'en og ny PIN"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "fejl ved læsning af programdata\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "fejl ved læsning af fingeraftryk DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "nøgle findes allerede\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "eksisterende nøgle vil blive erstattet\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "opretter ny nøgle\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "skriver ny nøgle\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "oprettelsestidsstempel mangler\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA-primtal %s mangler eller har ikke størrelsen %d bit\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "kunne ikke gemme nøglen: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported algorithm: %s"
msgid "unsupported curve\n"
msgstr "ikke understøttet algoritme: %s"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "vent venligst mens nøglen bliver oprettet ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "oprettelse af nøgle mislykkedes\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -8133,32 -6498,26 +8123,32 @@@ msgid_plural "key generation completed
msgstr[0] "nøgleoprettelse færdig (%d sekunder)\n"
msgstr[1] "nøgleoprettelse færdig (%d sekunder)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "fingeraftryk på kort matcher ikke den anmodte\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "underskrifter oprettet indtil videre: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"verifikation af administrator-PIN er i øjeblikket forbudt via denne "
"kommando\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@@ -8178,11 -6534,9 +8168,11 @@@ msgstr "|N|Oprindelig ny PIN
msgid "run in multi server mode (foreground)"
msgstr "kør i flerservertilstand (forgrund)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FILE|skriv en log til FIL"
@@@ -8244,12 -6587,10 +8234,12 @@@ msgid "please use the option '--daemon
msgstr ""
"brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "håndtering for fd %d startet\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "håndtering for fd %d termineret\n"
@@@ -8325,9 -6651,6 +8315,9 @@@ msgstr "antallet af matchende certifika
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "dirmngr cache-only-nøgleopslag mislykkedes: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "kunne ikke allokere keyDB-håndtag\n"
@@@ -8502,7 -6785,6 +8492,7 @@@ msgstr "valideringsmodel brugt: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(dette er MD2-algoritmen)\n"
@@@ -8545,7 -6820,6 +8535,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "fejl ved indhentelse af nøglebrugsinformation: %s\n"
@@@ -8821,11 -7042,9 +8811,11 @@@ msgstr "Klar. Du skal nu sende denne fo
msgid "resource problem: out of core\n"
msgstr "ressourceproblem: ikke nok kerne\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(dette er RC2-algoritmen)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(dette ser ikke ud til at være en krypteret besked)\n"
@@@ -8857,129 -7071,98 +8847,129 @@@ msgstr "certifikat »%s« slettet\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "ingen gyldige modtagere angivet\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "vis eksterne nøgler"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "vis certifikatkæde"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "importer certifikater"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "eksporter certifikater"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "registrer et smartkort"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "send en kommando til dirmngr'en"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "opstart gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "opret base-64-kodet resultat"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "antag inddata er i PEM-format"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "antag inddata er i base-64-format"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "antag inddata er i binært format"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "konsulter aldrig en CRL"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "kontroller validitet med OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|antal certifikater der skal inkluderes"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|tag politikinformation fra FIL"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "kontroller ikke certifikatpolitikker"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "hent manglende udstedercertifikater"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "brug overhovedet ikke terminalen"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|skriv en servertilstandslog til FIL"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|skriv en revisionslog til FIL"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "kørselstilstand: spørg aldrig"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "forvent ja til de fleste spørgsmål"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "forvent nej til de fleste spørgsmål"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|tilføj nøglering til nøgleringslisten"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|brug chifferalgoritme NAVN"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -8994,50 -7177,41 +8984,50 @@@ msgstr "
"Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
"standardhandling afhænger af inddata\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "BEMÆRK: kan ikke kryptere til »%s«: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "ukendt valideringsmodel »%s«\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: intet værtsnavn angivet\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: adgangskode angivet uden bruger\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: udelader denne linje\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "kunne ikke fortolke nøgleserver\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importerer gængse certifikater »%s«\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "kan ikke underskrive med »%s«: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@@ -9098,7 -7260,6 +9088,7 @@@ msgstr "problem under gensøgning af ce
msgid "error storing flags: %s\n"
msgstr "fejl ved lagring af flag: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Fejl - "
@@@ -9135,7 -7292,6 +9125,7 @@@ msgstr "
"\n"
"%s%sEr du sikker på, at det er hvad du ønsker?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9154,51 -7309,41 +9144,51 @@@ msgstr "
"»%s«\n"
"Bemærk, at dette certifikat IKKE vil oprette en kvalificeret underskrift!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"hashalgoritme %d (%s) for underskriver %d er ikke understøttet; bruger %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "hashalgoritme brugt for underskriver %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Underskrift lavet "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[dato ikke angivet]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " bruger certifikat-id 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"ugyldig underskrift: attribut for beskedsammendag matcher ikke den "
"beregnede\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "God underskrift fra"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " også kendt som"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Dette er en kvalificeret underskrift\n"
@@@ -10078,126 -8062,98 +10068,126 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "|FILE|run commands from FILE on startup"
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|kør kommandoer fra FIL ved opstart"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "send en kommando til dirmngr'en"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|skriv servertilstandslogge til FIL"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Afslut uden at gemme? (j/N) "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillad PKA-opslag (DNS-forespørgsler)"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FIL|læs tilvalg fra FIL"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|brug nøgleserver på adressen"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10210,13 -8166,11 +10200,13 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10228,88 -8182,71 +10218,88 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "brug: gpgsm [tilvalg] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s ikke tilladt med %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
#| msgid "line too long - skipped\n"
msgid "%s:%u: line too long - skipped\n"
msgstr "linje er for lang - udeladt\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ugyldig fingeraftryk"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "læsefejl i »%s«: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "ikke tvunget"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10499,7 -8400,16 +10489,20 @@@ msgstr "»%s« er ikke en JPEG-fil\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ #| msgid "error running `%s': exit status %d\n"
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
+
++#: dirmngr/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"
+ msgstr "fejl ved allokering af nok hukommelse: %s\n"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
#| msgid "error writing to %s: %s\n"
msgid "error printing log line: %s\n"
@@@ -10571,12 -8469,10 +10574,12 @@@ msgstr "sender nøgle %s til %s server
msgid "malloc failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10648,13 -8532,6 +10651,7 @@@ msgstr "fejl ved skrivning til »%s«:
msgid "error reading HTTP response for '%s': %s\n"
msgstr "fejl ved læsning fra %s: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- #| msgid "error running `%s': exit status %d\n"
- msgid "error accessing '%s': http status %u\n"
- msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
@@@ -10787,86 -8640,70 +10784,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "afsendelse af linje mislykkedes: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "afsendelse af linje mislykkedes: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
#| msgid "cannot allocate outfile string: %s\n"
msgid "can't allocate control structure: %s\n"
msgstr "kan ikke allokere outfile-streng: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
#| msgid "failed to create stream from socket: %s\n"
msgid "failed to allocate assuan context: %s\n"
msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -11020,193 -8828,146 +11017,193 @@@ msgstr "afsendelse af linje mislykkedes
msgid "error sending standard options: %s\n"
msgstr "fejl under afsendelse af standardtilvalg: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Tilvalg der kontrollerer konfigurationen"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Tilvalg nyttige for fejlsøgning"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Tilvalg der kontrollerer sikkerheden"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|udløb SSH-nøgler efter N sekunder"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|angiv minimal krævet længde for nye adgangsfraser til N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|kræv mindst N ikkealfanumeriske tegn for en ny adgangsfrase"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|giv adgangsfrasen udløb efter N dage"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "tillad ikke genbrug af gamle adgangsfraser"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|krypter også til bruger-id-NAVN"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|opsæt e-post-aliasser"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Konfiguration for nøgleservere"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|brug nøgleserver på adressen"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "tillad PKA-opslag (DNS-forespørgsler)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MECHANISMS|brug MEKANISMER til at finde nøgler efter postadresser"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "deaktiver al adgang til dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "kontroller ikke CRL'er for rodcertifikater"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Tilvalg der kontrollerer formatet for resultatet"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Tilvalg der kontrollerer sikkerheden"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Konfiguration for HTTP-servere"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "brug systemets HTTP-proxyopsætning"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguraiton af LDAP-servere der skal bruges"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "LDAP-serverliste"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Konfiguration for OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Ugyldig adgangsfrase"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Komponent blev ikke fundet"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Ekstern verifikation af komponent %s mislykkedes"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Bemærk at gruppespecifikationer ignoreres\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing '%s'\n"
msgstr "fejl ved lukning af %s: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -11288,13 -9033,11 +11285,13 @@@ msgstr "brug som uddatafil
msgid "activate changes at runtime, if possible"
msgstr "aktiver ændringer ved kørselstid, hvis muligt"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11306,15 -9049,12 +11303,15 @@@ msgstr "
"Syntaks: gpgconf [tilvalg]\n"
"Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Kræver en kompomentparameter"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Komponent blev ikke fundet"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Ingen parameter tilladt"
diff --cc po/de.po
index 58f7310,f71602d..35fe9bb
--- 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-05-15 16:15+0200\n"
- "PO-Revision-Date: 2017-05-15 16:00+0200\n"
++"POT-Creation-Date: 2017-07-28 19:15+0200\n"
+ "PO-Revision-Date: 2017-07-28 18:50+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@@ -19,7 -18,6 +19,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
@@@ -30,47 -28,37 +30,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "_Abbrechen"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr "_Ja"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr "_Nein"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr "Im Passwordmanager _speichern"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr ""
"Möchten Sie die eingegebene Passphrase wirklich auf dem Bildschirm sichtbar "
"machen?"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr "Die Passphrase sichtbar machen"
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
msgid "|pinentry-tt|Hide passphrase"
msgstr "Passphrase unsichtbar machen"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Qualität:"
@@@ -80,14 -68,12 +80,14 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
"Bitte fragen sie Ihren Systembeauftragten nach den\n"
"Kriterien für die Messung der Qualität."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -95,7 -81,6 +95,7 @@@ msgstr "
"Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
"kann"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -103,53 -88,40 +103,53 @@@ msgstr "
"Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
"werden kann."
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Passphrase:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (Versuch %d von %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "Nochmal:"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "Die PIN ist zu lang"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Das Mantra (Passphrase) ist zu lang!"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Ungültige Zeichen in der PIN!"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "Die PIN ist zu kurz!"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Falsche PIN!"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Falsche Passphrase!"
@@@ -158,56 -129,34 +158,56 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "Erkannte Karte hat die Seriennummer: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "keine passender Kartenschlüssel gefunden: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, c-format
msgid "error getting list of cards: %s\n"
msgstr "Fehler beim Holen der Liste der Karten: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Erlauben"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Verweigern"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -245,65 -189,51 +245,65 @@@ msgstr "
"Schlüssel%%0A %s%%0A %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
"schützen."
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Die legen Sie die Karte mit der folgenden Seriennummer ein:"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
"Bitte entfernen Sie die vorhanden Karte und legen Sie die mit der folgenden "
"Seriennummer ein:"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Admin-PIN"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Rückstellcode"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AZur Eingabe die Tastatur des Kartenlesers verwenden."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Rückstellcode bitte wiederholen"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "PUK bitte wiederholen"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "PIN bitte wiederholen"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Rückstellcode wurde nicht richtig wiederholt; noch einmal versuchen"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK wurde nicht richtig wiederholt; noch einmal versuchen"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Bitte geben Sie die PIN%s%s%s ein, um die Karte zu entsperren"
@@@ -387,8 -304,6 +387,8 @@@ msgstr "Bitte geben Sie die Passphrase
msgid "Please enter the new passphrase"
msgstr "Bitte geben Sie die Passphrase ein:"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -396,134 -311,98 +396,138 @@@ msgstr "
"@Optionen:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "Im Server Modus ausführen"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
msgid "run in supervised mode"
msgstr "Im \"Supervised\" Modus ausführen"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "Detaillierte Informationen"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "Reduzierte Informationen"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "Ausgabe für /bin/sh"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "Im Vordergrund laufen lassen"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "Tastatur und Maus nicht \"grabben\""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "Logausgaben in eine Datei umlenken"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|Benutze PGM as PIN-Entry"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|Benutze PGM als SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|Einige Kommandos über NAME annehmen"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "Ignoriere Anfragen, das TTY zu wechseln"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "Benutze PINs im Cache nicht beim Signieren"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "disallow the use of an external password cache"
msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "Erlaube ein \"preset\" von Passphrases"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr "Aufrufer darf das Pinentry nicht ersetzen"
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr "Erlaube die Eingabe einer Passphrase über Emacs"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "SSH Unterstützung einschalten"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr "Verwende ALGO für SSH Fingerabdrücke"
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
msgstr "PuTTY Unterstützung einschalten"
#. 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <de at li.org>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -531,143 -410,109 +535,148 @@@ 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:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "Der Name des Sockets `%s' ist zu lang\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Zugriffsrechte für '%s' können nicht gesetzt werden: %s\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 g10/openfile.c:398
+#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Aufruf: gpg-preset-passphrase [Optionen] KEYGRIP (-h für Hilfe)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -675,8 -520,6 +684,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -684,9 -527,6 +693,9 @@@ msgstr "
"@Befehle:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -742,8 -574,6 +751,8 @@@ msgstr "Vom Benutzer abgebrochen\n
msgid "error while asking for the passphrase: %s\n"
msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
@@@ -807,8 -628,6 +816,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Nein"
@@@ -864,7 -676,6 +873,7 @@@ msgstr "Die Passphrase ändern
msgid "I'll change it later"
msgstr "Ich werde sie später ändern"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -873,11 -684,9 +882,11 @@@ msgstr "
"Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A %s%%0A %%C%%0Awirklich "
"entfernen?"
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "Schlüssel löschen"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -901,7 -707,6 +910,7 @@@ msgid "a %zu bit hash is not valid for
msgstr ""
"Ein %zu-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
@@@ -939,8 -734,6 +948,8 @@@ msgstr "Fehler beim Erzeugen einer \"Pi
msgid "error creating a stream for a pipe: %s\n"
msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@@ -1066,7 -833,6 +1075,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
@@@ -1081,7 -845,6 +1090,7 @@@ msgstr "%s:%u: Die Option \"%s\" is ver
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "Unbekanntes Debug Flag '%s' wird ignoriert\n"
@@@ -1185,8 -925,6 +1194,8 @@@ msgstr "Sitzungsschlüssel erzeugt
msgid "algorithm: %s"
msgstr "Verfahren: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "Nicht unterstütztes Verfahren: %s"
@@@ -1352,7 -1052,6 +1361,7 @@@ msgstr "Ungültige Option
msgid "missing argument for option \"%.50s\"\n"
msgstr "Fehlendes Argument für Option \"%.50s\"\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "Ungültiges Argument für Option \"%.50s\"\n"
@@@ -1377,7 -1072,6 +1386,7 @@@ msgstr "Option \"%.50s\" ist mehrdeutig
msgid "command \"%.50s\" is ambiguous\n"
msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "Nicht genügend Speicher\n"
@@@ -1435,8 -1118,6 +1444,8 @@@ msgstr "Dateisperre %s konnte nicht ein
msgid "waiting for lock %s...\n"
msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
@@@ -1559,7 -1214,6 +1568,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "Die %s \"inquiry\" konnte nicht an den Client weitergeleitet werden\n"
@@@ -1568,33 -1221,30 +1577,39 @@@
msgid "Enter passphrase: "
msgstr "Geben Sie die Passphrase ein: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, c-format
msgid "error getting version from '%s': %s\n"
msgstr "Fehler beim Holen der Version von '%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr "Der Server '%s' is älter als wir selbst (Version %s < %s)"
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, c-format
msgid "WARNING: %s\n"
msgstr "WARNUNG: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, c-format
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s is nicht konform mit dem %s Modus\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
@@@ -1602,14 -1251,9 +1617,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Der Rückstellcode ist nicht vorhanden\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Ihre Auswahl? "
@@@ -1667,90 -1298,55 +1682,75 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "URL um den öffentlichen Schlüssel zu holen: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
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:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Logindaten (Kontenname): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Geheime DO-Daten: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Spracheinstellungen"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Fehler: ungültige Antwort.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "CA-Fingerabdruck: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "Schlüsseloperation nicht möglich: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "Keine gültige OpenPGP-Karte"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1762,60 -1358,48 +1762,60 @@@ msgstr "
" fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
" zu Rate.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie für den Signatur-Schlüssel? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr ""
"Welche Schlüssellänge wünschen Sie für den Verschlüsselungs-Schlüssel? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr ""
"Welche Schlüssellänge wünschen Sie für den Authentisierungs-Schlüssel? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Die Karte wird nun rekonfiguriert, um einen Schlüssel von %u Bit zu "
"erzeugen\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "Fehler bem Ändern der Länge des Schlüssels %d auf %u Bit: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1826,163 -1410,119 +1826,163 @@@ msgstr "
" PIN = '%s' Admin-PIN = '%s'\n"
"Sie sollten sie mittels des Befehls --change-pin ändern\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Signatur-Schlüssel\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Verschlüsselungs-Schlüssel\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Authentisierungs-Schlüssel\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Ungültige Auswahl.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
msgid "This command is not supported by this card\n"
msgstr "Dieser Befehl wird von dieser Karte nicht unterstützt.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr ""
"Hinweis: Dieses Kommando zerstörrt alle auf der Karte gespeicherten "
"Schlüssel!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
msgid "Continue? (y/N) "
msgstr "Fortsetzen? (j/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "Menü verlassen"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "Zeige Admin-Befehle"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "Diese Hilfe zeigen"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "Alle vorhandenen Daten auflisten"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "Kartenbesitzernamen ändern"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "Schlüssel-holen-URL ändern"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "Holen des Schlüssels mittels der URL auf der Karte"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "Ändern der Logindaten"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "Ändern der Spracheinstellungen"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "Ändern des Geschlechts des Kartenbesitzers"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "Ändern des CA-Fingerabdrucks"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "neue Schlüssel erzeugen"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "Menü für Ändern oder Entsperren der PIN"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "überprüfe die PIN und liste alle Daten auf"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "die PIN mit dem Rückstellcode wieder freigeben"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr "alle Schlüssel und Daten löschen"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "nur-Admin Befehl\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Admin-Befehle sind erlaubt\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Admin-Befehle sind nicht erlaubt\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Befehl\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
@@@ -2042,38 -1570,31 +2042,38 @@@ msgstr "
"Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
"entfernen.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
"werden\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "benutze Cipher %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "`%s' ist bereits komprimiert\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "Lesen von '%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2081,7 -1602,16 +2081,20 @@@ msgstr "
"WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
"%s (%d) verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr ""
+ "Das Verschlüsselungsverfahren %s darf im %s Modus nicht verwendet werden.\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr ""
+ "WARNUNG: Schlüssel %s ist zur Verschlüsselung im %s Modus nicht geeignet.\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2090,40 -1620,33 +2103,40 @@@ msgstr "
"WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
"Empfängervoreinstellungen.\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
"verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschlüsselt für: %s\n"
- #: g10/encrypt.c:934 g10/pkclist.c:1029 g10/pkclist.c:1080
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
#, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
+ msgid "option '%s' may not be used in %s mode\n"
+ msgstr "Die Benutzung der Option \"%s\" ist im %s-Modus nicht erlaubt.\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s verschlüsselte Daten\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"WARNUNG: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
@@@ -2207,36 -1713,27 +2220,36 @@@ msgstr "Während des Exports soviel wi
msgid "use the GnuPG key backup format"
msgstr "Das GnuPG Datensicherungsformat für Schlüssel benutzen"
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
msgstr " - übersprungen"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "Schreiben nach '%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übersprungen\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2303,214 -1787,166 +2316,219 @@@ msgstr "\"%s\" wird als voreingestellte
msgid "all values passed to '%s' ignored\n"
msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "Gültige Argumente für Option '%s':\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "Eine Signatur erzeugen"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "Eine Klartextsignatur erzeugen"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "Eine abgetrennte Signatur erzeugen"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "Daten verschlüsseln"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "Signatur prüfen"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "Liste der Schlüssel"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "Liste der Schlüssel und ihrer Signaturen"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "Schnell ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
msgid "quickly add a new user-id"
msgstr "Schnell eine neue User-ID anfügen"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly revoke a user-id"
msgstr "Schnell eine User-ID widerrufen"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "quickly set a new expiration date"
msgstr "Schnell ein neues Ablaufdatum setzen"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "Schlüssel schnell signieren"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "Schlüssel schnell nur für diesen Rechner signieren"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "Schlüssel signieren"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "Schlüssel nur für diesen Rechner signieren"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "Signieren oder bearbeiten eines Schlüssels"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "Schlüssel exportieren"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "Schlüssel zu einem Schlü.server exportieren"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "Schlüssel von einem Schlü.server importieren"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "Schlüssel auf einem Schlü.server suchen"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "alle Schlüssel per Schlü.server aktualisieren"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "Schlüssel importieren/kombinieren"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "den Karten-Status ausgeben"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "Daten auf einer Karte ändern"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "PIN einer Karte ändern"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "Ändern der \"Trust\"-Datenbank"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "Hashwerte für die Dateien ausgeben"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "Im Server Modus ausführen"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|Verschlüsseln für USER-ID"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "vor Überschreiben nachfragen"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2519,7 -1955,6 +2537,7 @@@ msgstr "
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
msgid ""
"@\n"
"Examples:\n"
@@@ -2539,11 -1974,9 +2557,11 @@@ msgstr "
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2553,7 -1986,6 +2571,7 @@@ msgstr "
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2561,74 -1993,59 +2579,74 @@@ msgstr "
"\n"
"Unterstützte Verfahren:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Verschlü.: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Komprimierung: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "Aufruf: %s [Optionen] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2636,20 -2053,17 +2654,20 @@@ msgstr "
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2657,452 -2071,337 +2675,432 @@@ msgstr "
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "Richtlinien-URL mit den Signaturen anlisten"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "Standard Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "Benutzer-Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
- #: 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:2069
++#: g10/gpg.c:2074
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Unbekannte TOFU Regel '%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
- #: 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:2244
++#: g10/gpg.c:2227
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Ungültiger Subjekt-Name '%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, c-format
msgid "invalid filter option: %s\n"
msgstr "Ungültige Filter-Option: %s\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "Foto-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "Alle Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
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:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
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:3251
++#: g10/gpg.c:3250
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:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
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:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
+ msgstr "Die Benutzung der Hashmethode %s ist im %s Modus nicht erlaubt.\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr ""
- "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
+ "Die Benutzung des Komprimierverfahren %s ist im %s Modus nicht erlaubt.\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
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:4088
++#: g10/gpg.c:4131
#, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
- msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
+ msgstr "Im %s Modus kann --symmetric --encrypt nicht verwendet werden.\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
++#: g10/gpg.c:4192
#, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr ""
- "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
+ "Im %s Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, 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:4931
++#: g10/gpg.c:4977
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:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@@ -3114,7 -2411,6 +3112,7 @@@ msgstr "|DATEI|Schlüssel aus der Schl�
msgid "make timestamp conflicts only a warning"
msgstr "differierende Zeitangaben sind kein Fehler"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
@@@ -3143,137 -2434,111 +3141,141 @@@ msgstr "Keine Hilfe vorhanden.
msgid "No help available for '%s'"
msgstr "Keine Hilfe für '%s' vorhanden."
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
- #: g10/import.c:158
++#: g10/import.c:166
msgid "do not clear the ownertrust values during import"
msgstr "die \"Ownertrust\" Werte beim Import nicht löschen"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
- #: g10/import.c:164
++#: g10/import.c:172
msgid "show key during import"
msgstr "Schlüssel beim Import anzeigen"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr "Import-Filter anwenden und Schlüssel direkt exportieren"
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr "Eingabedaten sind im GnuPG Datensicherungsformat für Schlüssel"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ msgid "repair keys on import"
+ msgstr "Schlüssel beim Import reparieren"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "überspringe den Block vom Typ %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu Schlüssel bislang bearbeitet\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignorierte PGP-2 Schlüssel: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorierte neue Schlüssel: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ohne User-ID: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importiert: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " unverändert: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " neue User-IDs: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " neue Unterschlüssel: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " neue Signaturen: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " neue Schlüsselwiderrufe: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gelesene geheime Schlüssel: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " geheime Schlüssel importiert: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " unveränderte geh. Schl.: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nicht importiert: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " Signaturen bereinigt: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " User-IDs bereinigt: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3282,191 -2547,153 +3284,191 @@@ msgstr "
"WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
"Verfahren für folgende User-ID:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": Einstellungen der Hashmethode %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
"Verfahrenskombinationen zu vermeiden\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
"ändern\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "Schlüssel %s: Keine User-ID\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "Schlüssel %s: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "vom Import-Aufpasser zurückgewiesen"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "Geheimer Schlüssel %s: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3483,146 -2710,119 +3485,146 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
"Um '%s' zu migrieren sollte für jede Smartcard \"%s\" aufgerufen werden.\n"
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
"angebracht werden\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
"übersprungen\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
"vorhanden\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@@ -3662,82 -2855,12 +3664,15 @@@ msgstr "Fehler beim Öffnen der Schlüs
msgid "failed to rebuild keyring cache: %s\n"
msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[Widerruf]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[Eigenbeglaubigung]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr ""
- "Die Signatur mit den nicht unterstützten Public-Key-Verfahren (%d) kann "
- "nicht geprüft werden: %s\n"
-
- #: g10/keyedit.c:642
- #, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr ""
- "Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
- "geprüft werden: %s.\n"
-
- #: g10/keyedit.c:805
- msgid " (reordered signatures follow)"
- msgstr " (neu geordnete Signaturen folgen)"
-
- #: g10/keyedit.c:918
- #, c-format
- msgid "key %s:\n"
- msgstr "Schlüssel %s:\n"
-
- #: g10/keyedit.c:921
- #, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "%d doppelte Signatur entfernt\n"
- msgstr[1] "%d doppelte Signaturen entfernt\n"
-
- #: g10/keyedit.c: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 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
- msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\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 falsche Beglaubigung\n"
- msgstr[1] "%d falsche Beglaubigungen\n"
-
- #: g10/keyedit.c:932
- #, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "%d Signatur neu eingeordnet\n"
- msgstr[1] "%d Signaturen neu eingeordnet\n"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
- "WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; um "
- "alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3750,17 -2873,14 +3685,17 @@@ msgstr "
"unterschiedlichen Quellen ...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Ich vertraue ihm marginal\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Ich vertraue ihm vollständig\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3770,52 -2890,40 +3705,52 @@@ msgstr "
"Eine Tiefe größer 1 erlaubt dem zu signierenden Schlüssel\n"
"Trust-Signatures für Sie zu machen.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Geben Sie bitte eine Domain ein, um die Signatur einzuschränken\n"
"oder nur die Eingabetaste für keine Domain\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "Überspringe User-ID \"%s\" da es keine textbasierte ID ist.\n"
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User-ID \"%s\" ist widerrufen."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Wollen Sie ihn immer noch beglaubigen? (j/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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Beglaubigen ist nicht möglich.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User-ID \"%s\" ist abgelaufen."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User-ID \"%s\" ist signierbar."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Wirklich signieren? (j/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3824,11 -2932,9 +3759,11 @@@ msgstr "
"Die Eigenbeglaubigung von \"%s\"\n"
"ist eine PGP 2.x artige Signatur.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3837,13 -2943,11 +3772,13 @@@ msgstr "
"Ihre derzeitige Beglaubigung von \"%s\"\n"
"ist abgelaufen.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? "
"(J/n) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3852,44 -2956,35 +3787,44 @@@ msgstr "
"Die derzeitige Beglaubigung von \"%s\"\n"
"ist nur für diesen Rechner gültig.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schlüssel %s lokal beglaubigt\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Dieser Schlüssel ist verfallen!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Dieser Schlüssel wird %s verfallen.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3899,32 -2994,26 +3834,32 @@@ msgstr "
"wollen, wirklich der o.g. Person gehört?\n"
"Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ich antworte nicht.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ich habe es überhaupt nicht überprüft.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ich habe es flüchtig überprüft.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ich habe es sehr sorgfältig überprüft.%s\n"
# translated by wk
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3933,227 -3022,173 +3868,227 @@@ msgstr "
"Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
"Schlüssel \"%s\" (%s) beglaubigen wollen\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"WARNUNG: Die Signatur wird nicht als nicht-exportierbar markiert werden.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "WARNUNG: Die Signatur wird nicht als unwiderrufbar markiert werden.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Die Signatur wird als nicht-exportfähig markiert werden.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Die Signatur wird als unwiderrufbar markiert werden.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Wirklich signieren? (j/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
"keine Passphrase ist zu ändern.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "Schlüssel %s: Fehler beim Ändern der Passphrase: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "speichern und Menü verlassen"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "Fingerabdruck des Schlüssels anzeigen"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
msgid "show the keygrip"
msgstr "\"Keygrip\" des Schlüssels anzeigen"
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "Schlüssel und User-IDs auflisten"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "User-ID N auswählen"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "Unterschlüssel N auswählen"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "Signaturen prüfen"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr "die ausgewählten User-IDs beglaubigen [* für verwandte Befehle s.u.]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "Eine User-ID hinzufügen"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "Eine Foto-ID hinzufügen"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "ausgewählte User-IDs entfernen"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "einen Unterschlüssel hinzufügen"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "der Smartcard einen Schlüssel hinzufügen"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "einen Schlüssel auf die Smartcard schieben"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "ausgewählte Unterschlüssel entfernen"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "Einen Widerrufschlüssel hinzufügen"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
"das Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "User-ID als Haupt-User-ID kennzeichnen"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "Liste der Voreinstellungen (für Experten)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "Liste der Voreinstellungen (ausführlich)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"Setze die URL des bevorzugten Schlüsselservers für die ausgewählten User-IDs"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "Eine Notation für die ausgewählten User-IDs setzen"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "Die Passphrase ändern"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "Den \"Ownertrust\" ändern"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "Ausgewählte User-ID widerrufen"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "Schlüssel anschalten"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "Schlüssel abschalten"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "ausgewählte Foto-IDs anzeigen"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"unbrauchbare User-IDs verkleinern und unbrauchbare Signaturen aus dem "
"Schlüssel entfernen"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"unbrauchbare User-IDs verkleinern und alle Signaturen aus dem Schlüssel "
"entfernen"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Geheimer Schlüssel ist vorhanden.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4166,273 -3201,219 +4101,283 @@@ msgstr "
"Signaturen\n"
" (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Schlüssel wurde widerrufen."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
msgid "Really sign all text user IDs? (y/N) "
msgstr "Wirklich alle textbasierten User-IDs beglaubigen? (j/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Unbekannter Signaturtyp `%s'\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Benutze den '%s' Befehl.)\n"
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? (j/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Diese User-ID wirklich entfernen? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Befehl benötigt einen Dateinamen als Argument\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Fehler beim Lesen der Sicherungskopie des Schlüssels von `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? (j/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? (j/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Diese User-ID wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr ""
"Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
"Datenbank benutzt wird\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Setze die Liste der Voreinstellungen auf:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
"(j/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Änderungen speichern? (j/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Beenden ohne zu speichern? (j/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "Änderung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
msgid "cannot revoke the last valid user ID.\n"
msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "Fehler beim Widerrufen der User-ID: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "Fehler beim Setzen der Haupt-User-ID: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" ist kein Fingerabdruck\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "Ungültige User-ID '%s': %s\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "Keine passende User-ID"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "Nichts zu beglaubigen\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "'%s' ist kein gültiges Ablaufdatum\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "\"%s\" ist kein gültiger Fingerabdruck\n"
+
++#: g10/keyedit.c:2929
+ #, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "Unterschlüssel \"%s\" nicht gefunden\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Eigenschaften: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Bevorzugter Schlüsselserver:"
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "\"Notationen\": "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Der folgende Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(empfindlich)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "erzeugt: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "widerrufen: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "verfallen: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "verfällt: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "Nutzung: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "Kartennummer:"
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "Vertrauen: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "Gültigkeit: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4440,19 -3421,13 +4385,19 @@@ 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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "verfallen"
# translated by wk
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4460,15 -3435,12 +4405,15 @@@ msgstr "
"WARNUNG: Keine User-ID ist als primär markiert. Dieser Befehl kann\n"
"dazu führen, daß eine andere User-ID als primär angesehen wird.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "Bitte erwägen Sie, dessen Verfallsdatum auch zu ändern.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4478,72 -3450,57 +4423,72 @@@ msgstr "
"könnte\n"
" bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "%d Beglaubigung entfernt.\n"
msgstr[1] "%d Beglaubigungen entfernt.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "ungültig"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "User-ID \"%s\": %d Signatur entfernt\n"
msgstr[1] "User-ID \"%s\": %d Signaturen entfernt\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User-ID \"%s\": bereits minimiert\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User-ID \"%s\": bereits sauber\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4553,216 -3510,175 +4498,221 @@@ msgstr "
" Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
" des Schlüssels führen.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
"hinzufügen.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
"eingetragen werden\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
"nicht rückgangig gemacht werden!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
"(j/N): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr ""
"Möchten Sie wirklich die Verfallsdaten aller Unterschlüssel ändern? (j/N): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"Unterschlüssel %s ist des Signieren nicht mächtig und braucht deshalb keine "
"Rücksignatur\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Bitte genau eine User-ID auswählen.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Geben Sie die \"Notation\" ein: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Fortfahren (j/N)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Keine User-ID mit Hash %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Kein Unterschlüssel mit Index %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "User-ID: \"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (nicht-exportierbar)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Nicht von Ihnen signiert.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (unwiderrufbar)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "Kein geheimer Schlüssel\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr "Versuch eine nicht-User-ID zu widerrufen: %s\n"
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"WARNUNG: Eine User-ID-Signatur datiert mit %d Sekunden aus der Zukunft\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Schlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Unterschlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
++#: g10/keygen.c:168
+ #, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "Ungültiges Argument für Option '%s'\n"
+
+#: g10/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "Voreinstellung `%s' ist doppelt\n"
@@@ -5191,8 -4030,6 +5141,8 @@@ msgstr "
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
@@@ -5263,7 -4087,6 +5213,7 @@@ msgstr "Fehler beim Schreiben des öff
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5272,7 -4095,6 +5222,7 @@@ msgstr "
"werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n"
"Unterschlüssel für diesem Zweck erzeugen.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5280,7 -4102,6 +5230,7 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5288,94 -4109,86 +5238,108 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Hinweis: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "niemals "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Entscheidende Beglaubigungsrichtlinie: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Beglaubigungsrichtlinie: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Entscheidender bevorzugter Schlüsselserver"
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Entscheidender Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "%d korrekte Signatur\n"
msgstr[1] "%d korrekte Signaturen\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, c-format
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d falsche Beglaubigung\n"
+ msgstr[1] "%d falsche Beglaubigungen\n"
+
++#: g10/keylist.c:482
+ #, c-format
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
+ msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
+
++#: g10/keylist.c:487
#, 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 Beglaubigung aufgrund eines Fehlers nicht geprüft\n"
msgstr[1] "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] "WARNUNG: %lu Schlüssel übersprungen, da er zu groß ist\n"
msgstr[1] "WARNUNG: %lu Schlüssel übersprungen, da sie zu groß sind\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Schlüsselbund"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Haupt-Fingerabdruck ="
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr "Unter-Fingerabdruck ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Haupt-Fingerabdruck ="
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Unter-Fingerabdruck ="
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
@@@ -5482,261 -4274,212 +5446,267 @@@ msgstr "Schlüssel wurde auf dem Schlü
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "fordere Schlüssel %s von %s-Server %s an\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "fordere Schlüssel %s von %s an\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
msgid "no keyserver known\n"
msgstr "Kein Schlüsselserver bekannt\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "übersprungen \"%s\": %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "sende Schlüssel %s auf %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "fordere Schlüssel von %s an\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "Seltsame Länge für einen verschlüsselten Sitzungsschlüssel (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s verschlüsselter Sitzungsschlüssel\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "Öffentlicher Schlüssel ist %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
# [kw]
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Verschlüsselt mit %lu Passphrases\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "Verschlüsselt mit einer Passphrase\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "vermutlich %s-verschlüsselte Daten\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr ""
"WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "Entschlüsselung erfolgreich\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "Entschlüsselung fehlgeschlagen: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Ursprünglicher Dateiname='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "Keine Signatur gefunden\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FALSCHE Signatur von \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Verfallene Signatur von \"%s\""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekte Signatur von \"%s\""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "Signaturüberprüfung unterdrückt\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur vom %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " mittels %s-Schlüssel %s\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatur vom %s mittels %s-Schlüssel ID %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, c-format
msgid " issuer \"%s\"\n"
msgstr " Aussteller \"%s\"\n"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Schlüssel erhältlich bei: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[ungewiß] "
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, c-format
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "WARNUNG: Dieser Schlüssel ist zum Signieren im %s Modus nicht geeignet.\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Diese Signatur verfällt am %s.\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s Signatur, Hashmethode %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "Binäre"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "Textmodus"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "unbekannt"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr ", Schlüsselverfahren "
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
"WARNUNG: Keine abgetrennte Signatur; die Datei '%s' wurde NICHT überprüft!\n"
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Signatur kann nicht geprüft werden: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "keine abgetrennte Signatur\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"WARNUNG: Mehrfache Signaturen erkannt. Es wird nur die erste geprüft.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Signatur der Klasse 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "Signatur nach alter (PGP 2.x) Art\n"
@@@ -5795,34 -4527,28 +5765,34 @@@ msgstr "(gemeldeter Fehler: %s <%s>)\n
msgid "(further info: "
msgstr "(weitere Infos: "
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: mißbilligte Option \"%s\".\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5830,37 -4556,30 +5800,37 @@@ msgstr "
"WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung nur\n"
"in %s.\n"
- #: g10/misc.c:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "nicht komprimiert"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "unkomprimiert|kein|keine"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "Mehrdeutige Option '%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "Unbekannte Option '%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
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:1848
++#: g10/misc.c:1742
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
@@@ -6382,37 -5002,35 +6352,43 @@@ msgstr "kann signierte Datei '%s' nich
msgid "can't open signed data fd=%d: %s\n"
msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr ""
+ "Hinweis: Schlüssel \"%s\" ist zum Verschlüsseln im %s Modus nicht geeignet.\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "Ungenannter Empfänger; Versuch mit geheimen Schlüssel %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"WARNUNG: Das Verschlüsselungsverfahren %s wurde nicht in den "
"Empfängereinstellungen gefunden\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Hinweis: geheimer Schlüssel %s verfällt am %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "Hinweis: Schlüssel wurde widerrufen"
@@@ -6582,7 -5172,6 +6558,7 @@@ msgstr "(Keine Beschreibung angegeben)\
msgid "Is this okay? (y/N) "
msgstr "Ist das OK? (j/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
@@@ -6604,26 -5190,26 +6580,32 @@@ msgid "%s key %s requires a %zu bit or
msgstr ""
"%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, c-format
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr ""
+ "Schlüssel \"%s\" darf zum Signieren im %s Modus nicht verwendet werden.\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "WARNUNG: Signaturunterschlüssel %s hat keine Rücksignatur\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "Siehe %s für weitere Infos\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "WARNUNG: Signaturunterschlüssel %s hat eine ungültige Rücksignatur\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, 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"
@@@ -6631,14 -5217,12 +6613,14 @@@ msgstr[0] "Öffentlicher Schlüssel %s
msgstr[1] ""
"Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Signatur\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, 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] "Öffentlicher Schlüssel %s ist %lu Tag jünger als die Signatur\n"
msgstr[1] "Öffentlicher Schlüssel %s ist %lu Tage jünger als die Signatur\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6651,7 -5235,6 +6633,7 @@@ msgstr[1] "
"Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhrenproblem)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6663,45 -5246,38 +6645,45 @@@ msgstr[1] "
"Schlüssel %s wurde %lu Tage in der Zukunft erzeugt (Zeitreise oder "
"Uhrenproblem)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"Vermutlich eine FALSCHE Signatur von Schlüssel %s, wegen unbekanntem "
"\"critical bit\"\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
"Beglaubigung\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindungs-"
"Beglaubigung\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende "
"\"unerweiterte\".\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6709,7 -5285,6 +6691,7 @@@ msgstr "
"WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu groß). Verwende "
"\"unerweiterte\".\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6718,12 -5293,10 +6700,12 @@@ msgstr "
"WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
"(zu groß). Verwende \"unerweiterte\".\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s Signatur von: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6731,31 -5304,25 +6713,31 @@@ msgstr "
"WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
"Empfängervoreinstellungen\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "signiere:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s Verschlüsselung wird verwendet\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "übersprungen \"%s\": doppelt\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
@@@ -6840,7 -5391,6 +6822,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "kann auf `%s' nicht zugreifen: %s\n"
@@@ -6949,77 -5477,60 +6931,77 @@@ msgstr "Textzeilen länger als %d Zeich
msgid "input line longer than %d characters\n"
msgstr "Eingabezeile ist länger als %d Zeichen\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "Fehler beim Starten einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "Fehler beim Committen einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
"Fehler beim Zurückrollen einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "Nicht unterstützte TOFU Datenbank Version: %s\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr "TOFU (Trust on First Use) database error"
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "Fehler beim Feststellen der TOFU Datenbank Version: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "Fehler beim Initialisieren der TOFU Datenbank: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, c-format
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:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, fuzzy, c-format
#| msgid "The email address \"%s\" is associated with %d key:\n"
#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7027,7 -5538,6 +7009,7 @@@ msgid "
"This is the first time the email address \"%s\" is being used with key %s."
msgstr "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, fuzzy, c-format
#| msgid "The email address \"%s\" is associated with %d key:\n"
#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7036,7 -5546,6 +7018,7 @@@ msgid_plural "The email address \"%s\"
msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
msgstr[1] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
#, fuzzy
#| msgid ""
#| "The key with fingerprint %s raised a conflict with the binding %s. Since "
@@@ -7047,51 -5556,42 +7029,51 @@@ msgstr "
"(%s). Die Richtlinie dieser Bindung wurde deswegen von 'auto' auf 'ask' "
"geändert."
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Fehler beim Einsammeln der übrigen User-IDs: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "Schlüssel und User-IDs auflisten"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, c-format
msgid "policy: %s"
msgstr "Richtlinie: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Fehler beim Einsammeln der Signaturstatistik: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, 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:1798
++#: g10/tofu.c:1797
msgid "this key"
msgstr "dieser Schlüssel"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "Verified %ld messages signed by \"%s\"."
msgid "Verified %d message."
@@@ -7099,7 -5599,6 +7081,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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7107,7 -5606,6 +7089,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:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -7116,7 -5614,6 +7098,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:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -7125,7 -5622,6 +7107,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:1853
++#: g10/tofu.c:1852
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7134,7 -5630,6 +7116,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1859
++#: g10/tofu.c:1858
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7143,7 -5638,6 +7125,7 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1869
++#: g10/tofu.c:1868
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7152,7 -5646,6 +7134,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " innerhalb des letzten Monats."
msgstr[1] " innerhalb der letzten %ld Monate."
- #: g10/tofu.c:1875
++#: g10/tofu.c:1874
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7161,7 -5654,6 +7143,7 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " innerhalb des letzten Monats."
msgstr[1] " innerhalb der letzten %ld Monate."
- #: g10/tofu.c:1885
++#: g10/tofu.c:1884
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7170,7 -5662,6 +7152,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1891
++#: g10/tofu.c:1890
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7179,14 -5670,12 +7161,14 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1898
#, 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:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7202,7 -5691,6 +7184,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:1920
++#: g10/tofu.c:1919
msgid "TOFU detected a binding conflict"
msgstr ""
"Normalerweise ist lediglich ein Schlüssel mit einer Email-Adresse "
@@@ -7216,89 -5704,74 +7198,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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr "gGaAuUlLfF"
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
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:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, 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:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] "%lld~Jahr"
msgstr[1] "%lld~Jahre"
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] "%lld~Monat"
msgstr[1] "%lld~Monate"
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] "%lld~Woche"
msgstr[1] "%lld Wochen"
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] "%lld~Tag"
msgstr[1] "%lld~Tage"
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] "%lld~Stunde"
msgstr[1] "%lld~Stunden"
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] "%lld~Minute"
msgstr[1] "%lld~Minuten"
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] "%lld~Sekunde"
msgstr[1] "%lld~Sekunden"
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, fuzzy, c-format
#| msgid "TOFU: few signatures %d message %s"
#| msgid_plural "TOFU: few signatures %d messages %s"
@@@ -7311,13 -5784,11 +7293,13 @@@ msgstr "
"suspekt erscheint, so benutzen Sie '%s' um den Schlüssel als Fälschung\n"
"zu markieren."
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d Beglaubigungen entfernt.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7334,13 -5805,11 +7316,13 @@@ msgstr[1] "
"%ld überprüfte Nachrichten von \"%s\"\n"
"in den letzten %s."
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "Verschlüsselt mit %lu Passphrases\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7357,13 -5826,11 +7339,13 @@@ msgstr[1] "
"%ld überprüfte Nachrichten von \"%s\"\n"
"in den letzten %s."
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "policy: %s"
msgid "(policy: %s)"
msgstr "Richtlinie: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
#, fuzzy
#| msgid "Warning: we've have yet to see a message signed by this key!\n"
msgid ""
@@@ -7372,7 -5839,6 +7354,7 @@@ msgstr "
"WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
"sehen.\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
#, fuzzy
#| msgid "Warning: we've only seen a single message signed by this key!\n"
msgid ""
@@@ -7381,7 -5847,6 +7363,7 @@@ msgstr "
"WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
"gesehen.\n"
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
#, 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"
@@@ -7389,7 -5854,6 +7371,7 @@@ msgstr "
"WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
"sehen.\n"
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
#, 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"
@@@ -7397,20 -5861,7 +7379,8 @@@ msgstr "
"WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
"gesehen.\n"
- #: g10/tofu.c:3260
- #, fuzzy, c-format
- #| msgid ""
- #| "Warning: if you think you've seen more than %ld message signed by this "
- #| "key, then this key might be a forgery! Carefully examine the email "
- #| "address for small variations. If the key is suspect, then use\n"
- #| " %s\n"
- #| "to mark it as being bad.\n"
- #| msgid_plural ""
- #| "Warning: if you think you've seen more than %ld messages signed by this "
- #| "key, then this key might be a forgery! Carefully examine the email "
- #| "address for small variations. If the key is suspect, then use\n"
- #| " %s\n"
- #| "to mark it as being bad.\n"
++#: g10/tofu.c:3258
+ #, 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 "
@@@ -7424,32 -5875,30 +7394,34 @@@ msgid_plural "
" %s\n"
"to mark it as being bad.\n"
msgstr[0] ""
- "WARNUNG: Falls sie glauben, mehr als %ld mit diesem Schlüssel signierte "
- "Nachricht erhalten zu haben, so kann es sich bei diesem Schlüssel um eine "
- "Fälschung handeln! Prüfen Sie die Email-Adresse genau auf kleine "
- "Variationen. Falls Ihnen der Schlüssel suspekt erscheint, so benutzen Sie\n"
- " %s\n"
+ "WARNUNG: Falls sie glauben, mehr mit diesem Schlüssel und dieser\n"
+ "User-ID signierte Nachricht erhalten zu haben, so kann es sich bei\n"
+ "diesem Schlüssel um eine Fälschung handeln! Prüfen Sie die\n"
+ "Email-Adresse genau auf kleine Abweichungen. Falls Ihnen der\n"
+ "Schlüssel suspekt erscheint, benutzen Sie\n"
+ " %s\n"
"um den Schlüssel als Fälschung zu markieren.\n"
msgstr[1] ""
- "WARNUNG: Falls sie glauben, mehr als %ld mit diesem Schlüssel signierte "
- "Nachrichten erhalten zu haben, so kann es sich bei diesem Schlüssel um eine "
- "Fälschung handeln! Prüfen Sie die Email-Adresse genau auf kleine "
- "Variationen. Falls Ihnen der Schlüssel suspekt erscheint, so benutzen Sie\n"
- " %s\n"
+ "WARNUNG: Falls sie glauben, mehr mit diesem Schlüssel und diesen\n"
+ "User-IDs signierte Nachrichten erhalten zu haben, so kann es sich\n"
+ "bei diesem Schlüssel um eine Fälschung handeln! Prüfen Sie die\n"
+ "Email-Adressen genau auf kleine Abweichungen. Falls Ihnen der\n"
+ "Schlüssel suspekt erscheint, benutzen Sie\n"
+ " %s\n"
"um den Schlüssel als Fälschung zu markieren.\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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7689,19 -6093,14 +7661,19 @@@ msgstr "
"Syntax: kbxutil [Optionen] [Dateien]\n"
"Anlisten exportieren und Importieren von KeyBox Dateien\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-Callback meldete Fehler: %s\n"
@@@ -7757,42 -6147,33 +7729,42 @@@ msgstr "
"|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
"Erstellung qualifizierter Signaturen ein."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
msgid "response does not contain the EC public key\n"
msgstr "Der EC Schlüssel fehlt in der Antwort\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
@@@ -7800,55 -6181,44 +7772,55 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr "%sNummer : %s%%0ABesitzer : %s%%0AAnzahl : %lu%s"
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr "%sNummer : %s%%0ABesitzer : %s%s"
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr "Verbliebene Versuche: %d"
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "Die Standard PIN wird für %s benutzt\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"Die Standard PIN für %s konnte nicht benutzt werden: %s - Die Standard PIN "
"wird nicht weiter benutzt\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
msgid "||Please unlock the card"
msgstr "||Bitte entsperren Sie die Karte"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "Karte ist dauerhaft gesperrt!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7858,23 -6228,18 +7830,23 @@@ msgstr[1] "Noch %d Admin-PIN-Versuche,
#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
#. the start of the string. Use %0A (single percent) for a linefeed.
- #: scd/app-openpgp.c:2243
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Bitte die Admin-PIN eingeben."
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Bitte die PIN eingeben"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
@@@ -7882,109 -6247,85 +7854,109 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Neuer Rückstellcode"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Neue Admin-PIN"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Neue PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "|A|Bitte die Admin-PIN sowie die neue Admin-PIN eingeben."
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Bitte die PIN sowie die neue PIN eingeben"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "Fehler beim Lesen der Anwendungsdaten\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "Schlüssel existiert bereits\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "Existierender Schlüssel wird ersetzt werden\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "neue Schlüssel werden erzeugt\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "der neue Schlüssel wird geschrieben\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "Erzeugungsdatum fehlt\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
msgid "unsupported curve\n"
msgstr "Nicht unterstützte Kurve\n"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "Schlüsselerzeugung fehlgeschlagen\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Schlüsselerzeugung abgeschlossen (%d Sekunde)\n"
msgstr[1] "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
"worden\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@@ -8004,11 -6342,9 +7976,11 @@@ msgstr "|N|Erstmalige neue PIN
msgid "run in multi server mode (foreground)"
msgstr "Im Multiserver Modus ausführen"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Die Debugstufe auf NAME setzen"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|DATEI|Schreibe Logs auf DATEI"
@@@ -8062,12 -6387,10 +8034,12 @@@ msgstr "
"Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
"auszuführen\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "Handhabungsroutine für fd %d gestartet\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Handhabungsroutine für den fd %d beendet\n"
@@@ -8138,9 -6446,6 +8110,9 @@@ msgstr "Anzahl der übereinstimmenden Z
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "Kann keinen KeyDB Handler bereitstellen\n"
@@@ -8324,7 -6589,6 +8296,7 @@@ msgid "a %u bit hash is not valid for
msgstr ""
"Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(Dies ist der MD2 Algorithmus)\n"
@@@ -8369,7 -6626,6 +8341,7 @@@ msgid "no key usage specified - assumin
msgstr ""
"Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
@@@ -8627,11 -6830,9 +8599,11 @@@ msgstr "Fertig. Sie sollten nun diese
msgid "resource problem: out of core\n"
msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(Dies ist der RC-2 Algorithmus)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(dies ist wahrscheinlich keine verschlüsselte Nachricht)\n"
@@@ -8660,127 -6856,96 +8632,127 @@@ msgstr "Zertifikat `%s' gelöscht\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "Keine gültigen Empfänger angegeben\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "Externe Schlüssel anzeigen"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "Schlüssel mit Zertifikatekette anzeigen"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "Zertifikate importieren"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "Zertifikate exportieren"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "Smartcard registrieren"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "Das Kommando an den Dirmngr durchreichen"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "Rufe das gpg-protect-tool auf"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "Ausgabe im Basis-64 Format erzeugen"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "Eingabedaten sind im PEM Format"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "Eingabedaten sind im Basis-64 Format"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "Eingabedaten sind im Binärformat"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "Niemals eine CRL konsultieren"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "Die Gültigkeit mittels OCSP prüfen"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|Sende N Zertifikate mit"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "Zertifikatsrichtlinien nicht überprüfen"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "Fehlende Zertifikate automatisch holen"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "das Terminal gar nicht benutzen"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Hashverfahren NAME benutzen"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8789,46 -6954,37 +8761,46 @@@ msgstr "
"Syntax: @GPGSM@ [Optionen] [Dateien]\n"
"Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: Kein Server-Name angegeben\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: Passwort ohne Benutzer\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: Zeile wird übersprungen\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "Importiere allgemeine Zertifikate: %s\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "Signieren mit `%s' nicht möglich: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@@ -8889,7 -7033,6 +8861,7 @@@ msgstr "Problem bei Wiederfinden des Ze
msgid "error storing flags: %s\n"
msgstr "Fehler beim Speichern der Flags: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Fehler - "
@@@ -8926,7 -7065,6 +8898,7 @@@ msgstr "
"\n"
"%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8946,52 -7083,42 +8918,52 @@@ msgstr "
"zu erzeugen. Bitte beachten Sie, daß dies KEINE qualifizierte\n"
"Signatur erzeugen wird."
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"Hashverfahren %d (%s) wird für Unterzeichner %d nicht unterstützt; %s wird "
"benutzt\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "Benutztes Hashverfahren für Unterzeichner %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Signatur erzeugt am "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[Datum nicht vorhanden]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " mittels Zertifikat ID 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"Ungültige Signatur: Nachricht entspricht nicht dem Prüfwert in der "
"Nachricht.\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Korrekte Signatur von"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " alias"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Dies ist eine qualifizierte Signatur.\n"
@@@ -9795,112 -7761,84 +9767,112 @@@ msgstr "Absoluter Dateiname erwartet\n
msgid "looking up '%s'\n"
msgstr "Auffinden von `%s'\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|Hole eine CRL von dieser URL"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "Den Dirmngr herunterfahren"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "Den Zwischenspeicher löschen"
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "Ausführung ohne Benutzernachfrage"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "Laden von abgelaufenen CRLs erzwingen"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "OCSP Anfragen erlauben"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr "Online Softwareversionstest erlauben"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "Sperre die Benutzung von HTTP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "Sperre die Benutzung von LDAP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr "Übergehe HTTP CRL Distribution Points"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr "Übergehe LDAP CRL Distribution Points"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|Leite alle HTTP Anfragen über URL"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|Benutze HOST für LDAP Anfragen"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "Füge neue Server aus den CRL Distribution Points der Serverliste hinzu"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|Setze die LDAP Zeitüberschreitung auf N Sekunden"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|DATEI|Benutze die CA Zertifikate in DATEI für HKP über TLS"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr "Netzzugriff nur über Tor"
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9910,11 -7848,9 +9882,11 @@@ msgstr "
"(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
"und Optionen)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9922,79 -7858,62 +9894,79 @@@ msgstr "
"Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
"Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "Gültige Debugebenen sind: %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "Aufruf: %s [Optionen] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: Lesefehler: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: Müll am Ende der Zeile wird ignoriert\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
"SIGHUP empfangen - lese die Konfiguration erneut und lösche die "
"Zwischenspeicher\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "Herunterfahren wurde erzwungen\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@@ -10164,7 -8047,14 +10136,18 @@@ msgstr "`%s' ist kein LDAP URL\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr "`%s' ist ein ungültiger LDAP URL\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "Fehler beim Schreiben einer Logzeile: %s\n"
@@@ -10229,12 -8107,10 +10212,12 @@@ msgstr "`%s:%d' wird der LDAP Serverlis
msgid "malloc failed: %s\n"
msgstr "malloc() fehlgeschlagen: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: Ungültiges Muster `%s'\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search erreichte die Größengrenze des Servers\n"
@@@ -10294,12 -8158,6 +10277,7 @@@ msgstr "Fehler beim Verbinden mit '%s'
msgid "error reading HTTP response for '%s': %s\n"
msgstr "Fehler beim Lesen der HTTP Antwort von `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "Fehler beim Zerlegen der OCSP Antwort für `%s': %s\n"
@@@ -10414,76 -8248,60 +10392,76 @@@ msgstr "OCSP Responder gab einen nicht
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP Responder gab einen zu alten Status zurück\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "LDAP Server fehlt"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "Seriennummer fehlt in der 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
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "Fehler beim Senden der Daten: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d überschritten\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "Fehler beim Initialisieren des Servers: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Fehler beim Registrieren der Kommandos gegen Assuan: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept Problem: %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@@ -10615,186 -8404,139 +10593,186 @@@ msgstr "Senden der Zeile schlug fehl: %
msgid "error sending standard options: %s\n"
msgstr "Fehler beim Senden der Standardoptionen: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Optionen zur Einstellung der Diagnoseausgaben"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Optionen zur Einstellung der Konfiguration"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Nützliche Optionen zur Fehlersuche"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Optionen zur Einstellung der Sicherheit"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Optionen für eine Passphrase-Policy"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "Einhaltung der Passphrase-Policy erzwingen"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|Verlange mindestens N Nicht-Buchstaben für eine neue Passphrase"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "Verbiete die Wiedernutzung alter Passphrases."
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|Auch an NAME verschlüsseln"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|Email Alias festlegen"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Konfiguration der Schlüsselserver"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "Benutze Schlüsselserver unter der URL"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
"|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
"aufzufinden."
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Optionen zum Einstellen der Ausgabeformate"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr "Optionen zur Benutzung von Tor"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Konfiguration für HTTP Server"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "Benutze die HTTP Proxy Einstellung des Systems"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration der zu nutzenden LDAP-Server"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "Liste der LDAP Server"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Konfiguration zu OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr "Geheime Schlüssel"
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr "Smartcard"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr "Netz"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
msgid "Passphrase Entry"
msgstr "Passphrase Eingabe"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "Komponente unterstützt kein direktes starten"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, c-format
msgid "error closing '%s'\n"
msgstr "Fehler beim Schließen von '%s'\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, c-format
msgid "error parsing '%s'\n"
msgstr "Fehler beim Hashen von '%s'\n"
@@@ -10863,11 -8589,9 +10841,11 @@@ msgstr "Als Ausgabedatei benutzen
msgid "activate changes at runtime, if possible"
msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Gebrauch: @GPGCONF@ [Optionen] (-h für Hilfe)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10875,15 -8599,12 +10853,15 @@@ msgstr "
"Syntax: @GPGCONF@ {Optionen]\n"
"Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Benötige ein Komponentenargument"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Komponente nicht gefunden"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Argumente sind nicht erlaubt"
diff --cc po/el.po
index 0156e88,b8a505b..2d0aebc
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -17,7 -16,6 +17,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
@@@ -28,40 -26,31 +28,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -69,7 -58,6 +69,7 @@@ msgstr "μη έγκυρη φράση κ
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -79,75 -67,59 +79,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "κακή φράση κλειδί"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "η γραμμή είναι πολύ μεγάλη\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "η φράση κλειδί είναι πολύ μεγάλη\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "κακό MPI"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "κακή φράση κλειδί"
@@@ -157,152 -128,111 +157,152 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
- #: agent/command-ssh.c:2473
++#: agent/command-ssh.c:2487
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "δε βρέθηκε εγγράψιμη μυστική κλειδοθήκη: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
- #: agent/command-ssh.c:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "αλλαγή της φράσης κλειδί"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Επαναλάβετε τη φράση κλειδί: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Επαναλάβετε τη φράση κλειδί: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Επαναλάβετε τη φράση κλειδί: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -381,8 -298,6 +381,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "αλλαγή της φράσης κλειδί"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -392,124 -307,95 +392,128 @@@ msgstr "
"Επιλογές:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Το κλειδί έχει παρακαμθεί"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ήσυχη έξοδος"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|ΟΝΟΜΑ|καθορισμός του σετ χαρακτήρων τερματικού σε ΟΝΟΜΑ"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "δεν υποστηρίζεται"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -518,179 -404,136 +522,184 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "αδυναμία δημιουργίας του %s: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "η ενημέρωση απέτυχε: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 g10/openfile.c:398
+#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: κατάλογος δημιουργήθηκε\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read απέτυχε (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: αδυναμία δημιουργίας καταλόγου: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: παραλείφθηκε: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -698,9 -541,6 +707,9 @@@ msgstr "
"@Εντολές:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -754,8 -586,6 +763,8 @@@ msgstr "Ακύρωση
msgid "error while asking for the passphrase: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -814,8 -635,6 +823,8 @@@ msgstr "
msgid "Yes"
msgstr "ναι|ναί"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -866,19 -678,16 +875,19 @@@ msgstr "αλλαγή της φράση�
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "ενεργοποιεί ένα κλειδί"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -898,7 -704,6 +907,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
@@@ -939,8 -734,6 +948,8 @@@ msgstr "σφάλμα στη δημιο�
msgid "error creating a stream for a pipe: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -1068,7 -835,6 +1077,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
@@@ -1083,7 -847,6 +1092,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1198,8 -938,6 +1207,8 @@@ msgstr "%s: κλειδοθήκη δημ
msgid "algorithm: %s"
msgstr "θωράκιση: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1391,7 -1091,6 +1400,7 @@@ msgstr "μη έγκυρες επιλο�
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
@@@ -1416,7 -1111,6 +1425,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "μη επεξεργασμένο"
@@@ -1475,8 -1158,6 +1484,8 @@@ msgstr "το δημόσιο κλειδ�
msgid "waiting for lock %s...\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1609,7 -1264,6 +1618,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: βρέθηκαν μη έγκυρα δεδομένα σημείωσης\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1618,35 -1271,33 +1627,42 @@@
msgid "Enter passphrase: "
msgstr "Πληκτρολογήστε τη φράση κλειδί: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "το μυστικό κλειδί δεν είναι διαθέσιμο"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
@@@ -1656,15 -1306,10 +1672,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Η επιλογή σας; "
@@@ -1726,154 -1358,107 +1742,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "αναωεωμένες επιλογές"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "απεικόνιση του fingerprint"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1881,179 -1466,135 +1882,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Υπογραφή έληξε στις %s.\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Μη έγκυρη επιλογή.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "η ενημέρωση απέτυχε: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Σίγουρα να υπογραφεί; "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "τερματισμός αυτού του μενού"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "συγκρουόμενες εντολές\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "απεικόνιση αυτής της βοήθειας"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Κλειδί διαθέσιμο στο: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "αλλαγή της ημερομηνίας λήξης"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "απεικόνιση του fingerprint"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "συγκρουόμενες εντολές\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "συγκρουόμενες εντολές\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Μη έγκυρη εντολή (δοκιμάστε \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output δεν λειτουργεί για αυτή την εντολή\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
@@@ -2116,39 -1645,32 +2117,39 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"χρησιμοποιείστε πρώτα την επιλογή \"--delete-secret-key\" για διαγραφή του.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "αδυναμία χρήσης ενός συμμετρικού πακέτου ESK λόγω της κατάστασης S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "χρήση του κρυπταλγόριθμου: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' ήδη συμπιέστηκε\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: `%s' είναι ένα άδειο αρχείο\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "ανάγνωση από `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2156,7 -1678,14 +2157,18 @@@ msgstr "
"ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
"επιλογές του παραλήπτη\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2165,41 -1694,35 +2177,42 @@@ msgstr "
"ο εξαναγκασμός χρήσης του αλγορίθμου συμπίεσης %s (%d) παραβιάζει τις\n"
"επιλογές του παραλήπτη\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
"επιλογές του παραλήπτη\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s κρυπτογραφήθηκε για: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s κρυπτογραφημένα δεδομένα\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το μήνυμα κρυπτογραφήθηκε με αδύναμο κλειδί στο\n"
"συμμετρικό κρυπταλγόριθμο.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "πρόβλημα στο χειρισμό κρυπτογραφημένου πακέτου\n"
@@@ -2290,41 -1796,32 +2303,41 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: παραλείφθηκε: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "εγγραφή στο `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr ""
"κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "κλειδί %08lX: κλειδί τύπου PGP 2.x - παραλείφθηκε\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2394,235 -1878,187 +2407,240 @@@ msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜ
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "χρήση του δευτερεύοντος κλειδιού %08lX αντί του πρωτεύοντος %08lX\n"
- #: g10/gpg.c:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[αρχείο]|δημιουργία μιας μη κρυπτογραφημένης υπογραφής"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "κρυπτογράφηση δεδομένων"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "κρυπτογράφηση με χρήση μόνο συμμετρικών αλγορίθμων"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "αποκρυπτογράφηση δεδομένων (προκαθορισμένο)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "επαλήθευση μιας υπογραφής"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "απεικόνιση της λίστας κλειδιών"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "απεικόνιση της λίστας κλειδιών και υπογραφών"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "έλεγχος υπογραφής κλειδιού"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "αφαίρεση των κλειδιών από τη μυστική κλειδοθήκη"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "υπογραφή ενός κλειδιού"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "υπογραφή ενός κλειδιού τοπικά"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "υπογραφή ενός κλειδιού"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "υπογραφή ενός κλειδιού τοπικά"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "υπογραφή ή επεξεργασία ενός κλειδιού"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "αλλαγή της φράσης κλειδί"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "εξαγωγή κλειδιών"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "εισαγωγή/συγχώνευση κλειδιών"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "δημιουργία ascii θωρακισμένης εξόδου"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "χρήση αυτής της ταυτότητας (user id) για υπογραφή ή αποκρυπτογράφηση"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|καθορισμός επιπέδου συμπίεσης N (0 απενεργοποιεί)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "χρήση κανονικής κατάστασης κειμένου"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "να μη γίνει καμμία αλλαγή"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "ερώτηση πριν την επικάλυψη"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2630,7 -2066,6 +2648,7 @@@ msgstr "
"@\n"
"(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2660,13 -2095,11 +2678,13 @@@ msgstr "
" --list-keys [ονόματα] απεικόνιση κλειδιών\n"
" --fingerprint [ονόματα] απεικόνιση αποτυπωμάτων (fingerprints)\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2681,7 -2114,6 +2699,7 @@@ msgstr "
"υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
"η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2689,554 -2121,423 +2707,536 @@@ msgstr "
"\n"
"Υποστηριζόμενοι αλγόριθμοι:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "ΔημοσΚλειδί:"
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Κρυπταλγόριθμος: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Συμπίεση: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "χρήση: gpg [επιλογές] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "συγκρουόμενες εντολές\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "δεν βρέθηκε το σύμβολο = στον ορισμό της ομάδας \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέρετε το κλειδί"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
- #: g10/gpg.c:2058 g10/gpg.c:2095
- #, fuzzy, c-format
- msgid "valid values for option '%s':\n"
- msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
-
- #: g10/gpg.c:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2105 g10/keygen.c:168
- #, fuzzy, c-format
- msgid "invalid value for option '%s'\n"
- msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
-
- #: g10/gpg.c:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Μη έγκυρη διεύθυνση Email\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "αδυναμία ορισμού του exec-path σε %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "το %s δεν επιτρέπεται με το %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"ο επιλεγμένος αλγόριθμος περίληψης για πιστοποίηση\n"
"δεν είναι έγκυρος\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed πρέπει να είναι μεγαλύτερα από 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed πρέπει να είναι μεγαλύτερα από 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "μη έγκυρο min-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "μη έγκυρη κατάσταση S2K; πρέπει να είναι 0, 1 ή 3\n"
- #: g10/gpg.c:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "μη έγκυρες προεπιλογές\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου περίληψης\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου συμπίεσης\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr ""
"απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr ""
"απαγορεύετε η χρήση του αλγόριθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν παραλήπτες (-r) χώρις χρήση κρυπτογράφησης\n"
"δημοσίου κλειδιού\n"
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver αποστολή απέτυχε: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver λήψη απέτυχε: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver αναζήτηση απέτυχε: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver ανανέωση απέτυχε: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "αποθωράκιση απέτυχε: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "θωράκιση απέτυχε: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Μπορείτε τώρα να εισαγάγετε το μήνυμα σας ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "το URL πολιτικής πιστοποιητικού που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
@@@ -3250,7 -2549,6 +3250,7 @@@ msgstr "εξαγωγή των κλει�
msgid "make timestamp conflicts only a warning"
msgstr "ορισμός των συγκρούσεων ώρας (timestamp) μόνο σαν προειδοποίηση"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|εγγραφή των πληροφοριών κατάστασης στο FD"
@@@ -3281,332 -2574,269 +3281,337 @@@ msgstr "Δεν υπάρχει διαθ�
msgid "No help available for '%s'"
msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "απεικόνιση του fingerprint"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "μη χρησιμοποιήσιμο μυστικό κλειδί"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "απεικόνιση του fingerprint"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "παράλειψη τμήματος του τύπου %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Συνολικός αριθμός που επεξεργάστηκαν: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " νέα κλειδιά που παραλείφθηκαν: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " νέα κλειδιά που παραλείφθηκαν: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " χωρίς user ID: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " εισαχθέντα: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " αμετάβλητα: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " νέα user ID: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " νέα υποκλειδιά: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " νέες υπογραφές: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " νέες ανακλήσεις κλειδιών: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " αναγνωσμένα μυστικά κλειδιά: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " εισαχθέντα μυστικά κλειδιά: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " αμετάβλητα μυστικά κλειδιά: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " μη εισαχθέντα: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " νέες υπογραφές: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " αναγνωσμένα μυστικά κλειδιά: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "παραλείφθηκε `%s': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "κλειδί %08lX: επιδιόρθωση φθαρμένου υποκλειδιού HKP\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "κλειδί %08lX: δεκτό μη ιδιο-υπογεγραμμένο user ID '%s'\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "κλειδί %08lX: δεν έχει έγκυρα user ID\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "αυτό μπορεί να συνέβει από μια απούσα ιδιοϋπογραφή\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "κλειδί %08lX: μυστικό κλειδί που δε βρέθηκε: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "κλειδί %08lX: νέο κλειδί - παραλείφθηκε\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "δεν βρεθηκε εγγράψιμη κλειδοθήκη: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "κλειδί %08lX: το δημόσιο κλειδί \"%s\" έχει εισαχθεί\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "κλειδί %08lX: δεν ταιριάζει με το αντίγραφο μας\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "κλειδί %08lX: αδυναμία εντοπισμού του αρχικού τμήματος κλειδιού: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του αρχικού τμήματος κλειδιού: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "κλειδί %08lX: \"%s\" 1 νέο user ID\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "κλειδί %08lX: \"%s\" 1 νέα υπογραφή\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "κλειδί %08lX: \"%s\" 1 νέο υποκλειδί\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "κλειδί %08lX: \"%s\" %d νέα υποκλειδιά\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "κλειδί %08lX: \"%s\" αμετάβλητο\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "κλειδί %08lX: μυστικό κλειδί εισήχθηκε\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "κλειδί %08lX: μυστικό κλειδί με άκυρο κρυπταλγ. %d - παραλείφθηκε\n"
@@@ -3621,147 -2851,120 +3626,147 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"κλειδί %08lX: όχι δημόσιο κλειδί - αδυναμία εφαρμογής πιστοποιητικού "
"ανάκλησης\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - απόρριψη\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης εισήχθηκε\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "κλειδί %08lX: δεν υπάρχει user ID για την υπογραφή\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού στο user id "
"\"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "κλειδί %08lX: μη έγκυρη ιδιο-υπογραφή στο user id \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση κλειδιού\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "κλειδί %08lX: μη έγκυρη δέσμευση υποκλειδιού\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "κλειδί %08lX: αφαιρέθηκε η δέσμευση πολλαπλού υποκλειδιού\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για την ανάκληση κλειδιού\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "κλειδί %08lX: μη έγκυρη ανάκληση υποκλειδιού\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "κλειδί %08lX: αφαιρέθηκε η ανάκληση πολλαπλού υποκλειδιού\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "κλειδί %08lX: παραλείφθηκε user ID '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "κλειδί %08lX: παραλείφθηκε υποκλειδί\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "κλειδί %08lX: μη εξαγόμενη υπογραφή (κλάση %02x) - παραλείφθηκε\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"κλειδί %08lX: το πιστοποιητικό ανάκλησης σε λάθος σημείο - παραλείφθηκε\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - παραλείφθηκε\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "κλειδί %08lX: μη αναμενώμενη κλάση υπογραφής (0x%02x) - παραλείφθηκε\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: λήψη κλειδιού ανάκλησης "
"%08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: το κλειδί ανάκλησης %08lX\n"
"δεν είναι παρών.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης προστέθηκε\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
@@@ -3803,79 -2999,12 +3808,15 @@@ msgstr "σφάλμα κατά την α
msgid "failed to rebuild keyring cache: %s\n"
msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[ανάκληση]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[ιδιο-υπογραφή]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Καλή υπογραφή από \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "παραλείφθηκε `%s': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Το user ID \"%s\" ανακαλείτε."
- msgstr[1] "Το user ID \"%s\" ανακαλείτε."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
- msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d κακές υπογραφές\n"
- msgstr[1] "%d κακές υπογραφές\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Καλή υπογραφή από \""
- msgstr[1] "Καλή υπογραφή από \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3888,68 -3017,53 +3829,68 @@@ msgstr "
"να κοιτάζει passports και fingerprints από διάφορες πηγές...);\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Έχω μερική εμπιστοσύνη\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Έχω πλήρη εμπιστοσύνη\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Το user ID \"%s\" ανακαλείτε."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Σίγουρα θέλετε ακόμα να το υπογράψετε; (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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Αδυναμία υπογραφής.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Το user ID \"%s\" έχει έληξε."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Σίγουρα να υπογραφεί; "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3958,11 -3072,9 +3899,11 @@@ msgstr "
"Η ιδιο-υπογραφή στο \"%s\"\n"
"είναι μια υπογραφή τύπου PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Θέλετε να τη προάγετε σε μια OpenPGP ιδιο-υπογραφή; (y/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3971,12 -3083,10 +3912,12 @@@ msgstr "
"Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
"έχει λήξει.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Θέλετε να ορίσετε μια νέα υπογραφή προς αντικατάσταση της ληγμένης; (y/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3985,43 -3095,34 +3926,43 @@@ msgstr "
"Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
"είναι μια τοπική υπογραφή.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Θέλετε να τη προάγετε σε μια πλήρη εξαγώγιμη υπογραφή; (y/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Σίγουρα θέλετε ακόμα να το ξαναυπογράψετε; (y/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Τίποτα για να υπογραφεί με το κλειδί %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Αυτό το κλειδί έχει λήξει!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Αυτό το κλειδί πρόκειτε να λήξει στις %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Θέλετε η υπογαφήσας να λήξει ταυτόχρονα; (Y/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4031,32 -3132,26 +3972,32 @@@ msgstr "
"ανήκει πράγματι στο προανφερθέν άτομο; Εάν δεν ξέρετε τι να απαντήσετε "
"πατήστε\"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Δεν απαντώ.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Δεν έχω ελέγξει καθόλου.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Έχω κάνει τον συνήθη έλεγχο.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Έχω κάνει εκτεταμένο έλεγχο.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Η επιλογή σας; (πληκτρολογήστε ? για πληροφορίες): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4065,21 -3160,18 +4006,21 @@@ msgstr "
"Σίγουρα θέλετε να υπογράψετε αυτό το κλειδί\n"
"με το κλειδί σας: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Αυτή θα είναι μια ιδιο-υπογραφή.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η υπογραφή δε θα σημειωθεί σαν μη-εξαγώγιμη.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
@@@ -4087,14 -3179,12 +4028,14 @@@
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η υπογραφή δε θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
"\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Η υπογραφή θα σημειωθεί σαν μη-εξαγώγιμη.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
@@@ -4102,233 -3192,184 +4043,233 @@@
"Η υπογραφή θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
"\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Δεν έχω ελέγξει καθόλου αυτό το κλειδί.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Έχω κάνει συνηθισμένο έλεγχο σε αυτό το κλειδί.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Έχω ελέγξει πολύ προσεκτικά αυτό το κλειδί.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Σίγουρα να υπογραφεί; "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "η υπογραφή απέτυχε: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "αποθήκευση και έξοδος"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "απεικόνιση του fingerprint"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Σημείωση υπογραφής: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "απεικόνιση των κλειδιών και των user ID"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "επιλογή user ID N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "επιλογή user ID N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "ανάκληση υπογραφών"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "υπογραφή του κλειδιού τοπικά"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "προσθήκη ενός user ID"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "προσθήκη ενός photo ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "διαγραφή ενός user ID"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "διαγραφή ενός δευτερεύοντος κλειδιού"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "προσθήκη ενός κλειδιού ανάκλησης"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "σημείωση του user ID σαν πρωτεύων"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "απεικόνιση προεπιλογών (ειδικές)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "απεικόνιση επιλογών (αναλυτικά)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "αλλαγή της φράσης κλειδί"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "ανάκληση ενός user ID"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "ανάκληση ενός δευτερεύοντος κλειδιού"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "ενεργοποιεί ένα κλειδί"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "απενεργοποιεί ένα κλειδί"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "απεικόνιση photo ID"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Απαιτείται το μυστικό κλειδί για να γίνει αυτό.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4336,295 -3377,241 +4277,305 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Το κλειδί ανακλήθηκε."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "άγνωστη κλάση υπογραφής"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Πρέπει να επιλέξετε το λιγότερο ένα user ID.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Δεν μπορείτε να διαγράψετε το τελευταίο user ID!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Σίγουρα θέλετε να διαγραφούν όλα τα επιλεγμένα user ID; "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το κλειδί; "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το user ID; "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Σίγουρα θέλετε να ανακληθούν τα επιλεγμένα κλειδιά; "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "ορισμός απεικόνισης επιλογών"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Σίγουρα να ανανεωθούν οι προεπιλογές;"
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Αποθήκευση των αλλαγών; "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Τερματισμός χωρίς αποθήκευση; "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "η ενημέρωση απέτυχε: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Το κλειδί δεν άλλαξε οπότε δεν χρειάζεται ενημέρωση.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Δεν μπορείτε να διαγράψετε το τελευταίο user ID!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "μη έγκυρη τιμή\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Δεν υπάρχει αυτό το user ID.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Τίποτα για να υπογραφεί με το κλειδί %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Περίληψη: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Δυνατότητε: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Σημείωση: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Δεν υπάρχουν προεπιλογές σε ένα user ID τύπου PGP 2.x.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (ευαίσθητο)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "αδυναμία δημιουργίας του %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[ανακλημένο]"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [λήγει: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [λήγει: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " εμπιστοσύνη: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " εμπιστοσύνη: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Αυτό το κλειδί έχει απενεργοποιηθεί"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4632,20 -3619,14 +4583,20 @@@ msgstr "
"Η εγγυρότητα του απεικονιζόμενου κλειδιού δεν είναι απαραίτητα σωστή\n"
"εκτός και εάν επανακκινήσετε το πρόγραμμα.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4653,17 -3634,14 +4604,17 @@@ msgstr "
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χρήστη σαν πρωτεύων. Αυτή η εντολή\n"
" μπορεί να κάνει ένα άλλο ID χρήστη να γίνει το πρωτεύων.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4672,35 -3650,27 +4623,35 @@@ msgstr "
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τύπου PGP2. Η προσθήκη ενός photo ID\n"
" μπορεί να κάνει μερικές εκδόσεις PGP να το απορρίψουν.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Σίγουρα ακόμα θέλετε να το προσθέσετε; (y/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Διαγραφή αυτής της καλής υπογραφής; (y/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Διαγραφή αυτής της μη έγκυρης υπογραφής; (y/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Διαγραφή αυτής της άγνωστης υπογραφής; (y/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Σίγουρα να διαγραφεί αυτή η ιδιο-υπογραφή; (y/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4708,38 -3678,31 +4659,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Διαγράφτηκε %d υπογραφή.\n"
msgstr[1] "Διαγράφτηκε %d υπογραφή.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Τίποτα δεν διαγράφτηκε.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "μη έγκυρη θωράκιση"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Το user ID \"%s\" ανακαλείτε."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Το user ID \"%s\" ανακαλείτε."
msgstr[1] "Το user ID \"%s\" ανακαλείτε."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4749,38 -3712,31 +4700,38 @@@ msgstr "
" καθορισμένου ανακλητή μπορεί να κάνει μερικές εκδόσεις PGP\n"
" να το απορρίψουν.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Δεν μπορείτε να προσθέσετε ένα καθορισμένο ανακλητή σε κλειδί τύπου PGP2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Πληκτρολογήστε το user ID του διορισμένου ανακλητή: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"αδυναμία ορισμού ενός κλειδιού τύπου PGP 2.x, σαν διορισμένου ανακλητή\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"δε μπορείτε να ορίσετε ένα κλειδί σαν το διορισμένο ανακλητή του εαυτού του\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ορισμένο ανακλητή!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ορίσετε ένα κλειδί σαν διορισμένο ανακλητή δεν μπορεί να "
"επανέλθει!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4788,7 -3744,6 +4739,7 @@@ msgstr "
"Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
"N): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4797,181 -3752,148 +4748,186 @@@ msgstr "
"Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
"N): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Αλλαγή ημερομηνίας λήξης για ένα δευτερεύον κλειδί.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Αλλαγή ημερομηνίας λήξης για ένα πρωτεύον κλειδί.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
"πιστοποιηθεί\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Πρέπει να επιλέξετε ακριβώς ένα user ID.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "παραλείφθηκε η v3 ιδιο-υπογραφή στο user id \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Σημείωση υπογραφής: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Επικάλυψη (y/N); "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " υπογράφθηκε από %08lX στις %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (μη-εξαγώγιμο)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Αυτή η υπογραφή έληξε στις %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτή την υπογραφή; (y/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " υπογράφθηκε από %08lX στις %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Έχετε υπογράψει αυτά τα user ID:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (μη-εξαγώγιμο)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " ανακλήθηκε από %08lX στις %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Σκοπεύετε να ανακαλέσετε αυτές τις υπογραφές:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Σίγουρα να δημιουργηθούν τα πιστοποιητικά ανάκλησης; (y/N)"
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "κανένα μυστικό κλειδί\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογραφή user ID έχει ημερομηνία %d δεύτερα στο μέλλον\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Δεν μπορείτε να διαγράψετε το τελευταίο user ID!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Απεικόνιση %s photo ID μεγέθους %ld για το κλειδί 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
@@@ -5417,8 -4262,6 +5373,8 @@@ msgstr "
"τους δίσκους) κατα τη διάρκεια υπολογισμού πρώτων αριθμών. Αυτό δίνει\n"
"στη γεννήτρια τυχαίων αριθμών μια ευκαιρία να μαζέψει αρκετή εντροπία.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
@@@ -5490,7 -4320,6 +5446,7 @@@ msgstr "αδυναμία εγγραφή
msgid "public and secret key created and signed.\n"
msgstr "το δημόσιο και το μυστικό κλειδί δημιουργήθηκαν και υπογράφηκαν.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5501,7 -4330,6 +5457,7 @@@ msgstr "
"Μπορείτε να χρησιμοποιήσετε την εντολή \"--edit-key\" για να δημιουργηθεί\n"
"ένα δευτερεύον κλειδί για αυτό το λόγο.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5509,7 -4337,6 +5465,7 @@@ msgstr "
"το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
"απλώς πρόβλημα στο ρολόι)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5517,7 -4344,6 +5473,7 @@@ msgstr "
"το κλειδί δημιουργήθηκε %lu δευτερόλεπτα στο μέλλον (χρονοδίνη ή\n"
"απλώς πρόβλημα στο ρολόι)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
@@@ -5525,45 -4351,35 +5481,45 @@@ msgstr "
"ΣΗΜΕΙΩΣΗ: η δημιουργία υποκλειδιών για κλειδιά v3 δεν είναι σύμφωνο\n"
"με το OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Σίγουρα να δημιουργηθεί; "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "ποτέ "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Πολιτική κρίσιμης υπογραφής: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Πολιτική υπογραφής: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Σημείωση κρίσιμης υπογραφής: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Σημείωση υπογραφής: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5571,7 -4387,20 +5527,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d κακές υπογραφές\n"
msgstr[1] "%d κακές υπογραφές\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d κακές υπογραφές\n"
+ msgstr[1] "%d κακές υπογραφές\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
+ msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5579,41 -4408,33 +5551,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγο ενός σφάλματος\n"
msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγο ενός σφάλματος\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Κλειδοθήκη"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Αποτύπωμα πρωτεύων κλειδιού:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Αποτύπωμα υποκλειδιού:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Αποτύπωμα πρωτεύων κλειδιού:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Αποτύπωμα υποκλειδιού:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Αποτύπωμα κλειδιού ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5723,266 -4523,219 +5695,274 @@@ msgstr "το κλειδί '%s' δε β�
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "αίτηση κλειδιού %08lX από το %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "αίτηση κλειδιού %08lX από το %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "παραλείφθηκε `%s': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"υπογράφθηκε με το κλειδί σας %08lX στις %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "αίτηση κλειδιού %08lX από το %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "παράξενο μέγεθος για ένα κλειδί κρυπτογραφημένης συνεδρίας (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s κλειδί κρυπτογραφημένης συνεδρία\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "δημόσιο κλειδί είναι %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "κρυπτογραφημένα δεδομένα με δημόσιο κλειδί: καλό DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "κρυπτογραφημένο με %u-bit %s κλειδί, ID %08lX, δημιουργήθηκε %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " γνωστό σαν \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "κρυπτογραφημένο με %s key, ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "κρυπτογράφηση με δημόσιο κλειδί απέτυχε: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "κρυπτογραφημένο με 1 φράση κλειδί\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "υπόθεση %s κρυπτογραφημένων δεδομένων\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"Κρυπταλγόριθμος IDEA μη διαθέσιμος, αισιόδοξη προσπάθεια χρήσης του\n"
"%s αντίθετα\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν προστατεύτηκε η ακεραιότητα του μηύματος\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "αποκρυπτογράφηση OK\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το κρυπτογραφημένο μήνυμα έχει πειραχθεί!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "ΣΗΜΕΙΩΣΗ: ο αποστολέας ζήτησε \"για-τα-μάτια-σας-μόνο\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "αρχικό όνομα αρχείου='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "ανεξάρτητη ανάκληση - χρησιμοποιείστε \"gpg --import\" για εφαρμογή\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Καλή υπογραφή από \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ΚΑΚΗ υπογραφή από \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Ληγμένη υπογραφή από \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Καλή υπογραφή από \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "καταστολή ανάκλησης υπογραφής\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "αδυναμία χειρισμού αυτών των πολλαπλών υπογραφών\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Υπογραφή έληξε στις %s.\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " γνωστό σαν \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Υπογραφή έγινε στο %.*s με χρήση του κλειδιού%s ID %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " γνωστό σαν \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Κλειδί διαθέσιμο στο: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[αβέβαιο]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " γνωστό σαν \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστεύσιμη "
+ "υπογραφή!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Υπογραφή έληξε στις %s.\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Υπογραφή λήγει στις %s.\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "δυαδικό"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "κατάσταση-κειμένου"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "άγνωστο"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "άγνωστος αλγόριθμος δημοσίου κλειδιού"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Αδυναμία ελέγχου της υπογραφής: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "δεν είναι αποκομμένη υπογραφή\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογραφών. Μόνο η πρώτη θα ελεγχθεί.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "ανεξάρτητη υπογραφή κλάσης 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "υπογραφή παλιού στυλ (PGP 2.x)\n"
@@@ -6045,67 -4787,54 +6025,67 @@@ msgstr "σφάλμα ανάγνωσης
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: μη συνειστώμενη επιλογή \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "παρακαλώ χρησιμοποιήστε το \"%s%s\" καλύτερα\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Ασυμπίεστο"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "Ασυμπίεστο"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "αυτό το μήνυμα ίσως δεν μπορεί να χρησιμοποιηθεί από %s\n"
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "ανάγνωση επιλογών από `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "άγνωστη κλάση υπογραφής"
@@@ -6622,35 -5252,32 +6602,40 @@@ msgstr "αδυναμία πρόσβασ
msgid "can't open signed data fd=%d: %s\n"
msgstr "αδυναμία πρόσβασης υπογεγραμμένων δεδομένων `%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "ανώνυμος παραλήπτης· δοκιμή μυστικού κλειδιού %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "εντάξει, είμαστε ο ανώνυμος παραλήπτης.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "παλαιά κωδικοποίηση του DEK δεν υποστηρίζεται\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "ο αλγόριθμος κρυπτογράφησης %d%s είναι άγνωστος ή απενεργοποιημένος\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "ΣΗΜΕΙΩΣΗ: ο αλγόριθμος κρυπτογράφησης %d δεν είναι στις επιλογές\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6812,7 -5411,6 +6797,7 @@@ msgstr "(Δεν δώθηκε περιγ
msgid "Is this okay? (y/N) "
msgstr "Είναι αυτό εντάξει; "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "δημιουργήθηκε αδύναμο κλειδί - επανάληψη προσπάθειας\n"
@@@ -6833,30 -5428,30 +6818,36 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σύγκρουση υπογραφής περίληψης στο μήνυμα\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
+
++#: g10/sig-check.c:191
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
"πιστοποιηθεί\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = απεικόνιση περισσότερων πληροφοριών\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX έχει άκυρη κατ' αντιπαράσταση "
"πιστοποίηση\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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"
@@@ -6865,7 -5460,6 +6856,7 @@@ msgstr[0] "
msgstr[1] ""
"το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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"
@@@ -6874,7 -5468,6 +6865,7 @@@ msgstr[0] "
msgstr[1] ""
"το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6887,7 -5480,6 +6878,7 @@@ msgstr[1] "
"το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
"απλώς πρόβλημα στο ρολόι)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6899,39 -5491,32 +6890,39 @@@ msgstr[1] "
"το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
"απλώς πρόβλημα στο ρολόι)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί υπογραφής %08lX έληξε στις %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "υπόθεση κακής υπογραφής από κλειδί %08lX λόγω άγνωστου κρίσιμου bit\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "κλειδί %08lX: κανένα υποκλειδί για το πακέτο ανάκλησης υποκλειδιού\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση υποκλειδιού\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στην %%-ανάπτυξη σημείωσης (πολυ μεγάλη).\n"
" Χρήση μη ανεπτυγμένου.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6939,7 -5524,6 +6930,7 @@@ msgstr "
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
" Χρήση μη ανεπτυγμένου.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6948,12 -5532,10 +6939,12 @@@ msgstr "
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
" Χρήση μη ανεπτυγμένου.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s υπογραφή από: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6961,31 -5543,25 +6952,31 @@@ msgstr "
"ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
"προεπιλογές του παραλήπτη\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "υπογραφή:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s κρυπτογράφηση θα χρησιμοποιηθεί\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"το κλειδί δεν έχει σημειωθεί σαν ανασφαλές - δεν μπορεί να χρησιμοποιηθεί με "
"ψεύτικη RNG!\n"
- #: g10/skclist.c:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "παραλείφθηκε `%s': αντιγράφτηκε\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7074,7 -5634,6 +7065,7 @@@ msgstr "πολύ μεγάλη συνα�
msgid "%s: directory does not exist!\n"
msgstr "%s: ο φάκελος δεν υπάρχει!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "αδυναμία κλεισίματος του `%s': %s\n"
@@@ -7186,149 -5723,120 +7177,149 @@@ msgstr "αδυναμία χειρισμ
msgid "input line longer than %d characters\n"
msgstr "γραμμή εισόδου μεγαλύτερη από %d χαρακτήρες\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Υποστηριζόμενοι αλγόριθμοι:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "απεικόνιση των κλειδιών και των user ID"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Πολιτική: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "απεικόνιση της λίστας κλειδιών"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7336,68 -5844,58 +7327,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
msgstr[1] "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
@@@ -7405,149 -5903,123 +7396,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Διαγράφηκαν %d υπογραφές.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Πολιτική: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7564,18 -6036,14 +7555,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7814,19 -6237,14 +7805,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7875,44 -6284,35 +7866,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
@@@ -7920,54 -6320,43 +7911,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "αλλαγή της φράσης κλειδί"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "keyserver αποστολή απέτυχε: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7977,26 -6366,21 +7968,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "αλλαγή της φράσης κλειδί"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "αλλαγή της φράσης κλειδί"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -8004,117 -6388,93 +7995,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "αλλαγή της φράσης κλειδί"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "αλλαγή της φράσης κλειδί"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' ήδη συμπιέστηκε\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "μη υποστηριζόμενο URI"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Η δημιουργία κλειδιού απέτυχε: %s\n"
msgstr[1] "Η δημιουργία κλειδιού απέτυχε: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
@@@ -8135,11 -6492,9 +8126,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
@@@ -8195,12 -6539,10 +8186,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8275,9 -6602,6 +8266,9 @@@ msgstr "σφάλμα στη δημιο�
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
@@@ -8464,7 -6748,6 +8455,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8509,7 -6785,6 +8500,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
@@@ -8773,11 -6995,9 +8764,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8806,139 -7021,108 +8797,139 @@@ msgstr "η προεπιλογή %c%lu �
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Δεν δώθηκε περιγραφή)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "κακό πιστοποιητικό"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "κακό πιστοποιητικό"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "κακό πιστοποιητικό"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "δημιουργία ascii θωρακισμένης εξόδου"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "μη χρήση τερματικού"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "κατάσταση batch: να μη γίνονται ερωτήσεις"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "απάντηση ναι στις περισσότερες ερωτήσεις"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "απάντηση όχι στις περισσότερες ερωτήσεις"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "προσθήκη αυτού του κλειδιού στη λίστα των κλειδοθηκών"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χρήση αυτού του διακομιστή κλειδιών για αναζήτηση"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου περίληψης μηνύματος ΟΝΟΜΑ "
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8949,47 -7133,38 +8940,47 @@@ msgstr "
"υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
"η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Δεν δώθηκε περιγραφή)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = παράλειψη αυτού του κλειδιού\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "εγγραφή στο `%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "αδυναμία κλεισίματος του `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9052,7 -7215,6 +9043,7 @@@ msgstr "rev? πρόβλημα στον
msgid "error storing flags: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9081,7 -7239,6 +9072,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9095,51 -7251,41 +9086,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Υπογραφή έληξε στις %s.\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Καλή υπογραφή από \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " γνωστό σαν \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9944,116 -7929,88 +9935,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Τερματισμός χωρίς αποθήκευση; "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10066,91 -8023,72 +10057,91 @@@ msgstr "
"@\n"
"(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "χρήση: gpg [επιλογές] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "το %s δεν επιτρέπεται με το %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "θωράκιση απέτυχε: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "θωράκιση απέτυχε: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "η γραμμή είναι πολύ μεγάλη\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "σφάλμα ανάγνωσης: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "μη επεξεργασμένο"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10330,7 -8232,14 +10321,18 @@@ msgstr "\"%s\" δεν είναι JPEG �
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
@@@ -10395,12 -8292,10 +10397,12 @@@ msgstr "αναζήτηση του \"%s\
msgid "malloc failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10464,12 -8347,6 +10466,7 @@@ msgstr "αδυναμία εγγραφή
msgid "error reading HTTP response for '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@@ -10588,77 -8441,61 +10585,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "η υπογραφή απέτυχε: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "η υπογραφή απέτυχε: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "αδυναμία δημιουργίας του `%s': %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10795,193 -8603,146 +10792,193 @@@ msgstr "η υπογραφή απέτυ�
msgid "error sending standard options: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|χρήση της κατάστασης φράσης κλειδί N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ για φράσεις κλειδιά"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "σφάλμα δικτύου"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "κακή φράση κλειδί"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "δεν βρέθηκε το δημόσιο κλειδί"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -11054,27 -8799,22 +11051,27 @@@ msgstr "χρήση ως αρχείου
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "δεν βρέθηκε το δημόσιο κλειδί"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
diff --cc po/en at boldquot.po
index 86e0679,0000000..e7f48ea
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10703 -1,0 +1,10690 @@@
+# English translations for GNU gnupg package.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gnupg package.
+# Automatically generated, 2017.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# 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.21\n"
++"Project-Id-Version: GNU gnupg 2.1.22\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-05-15 16:15+0200\n"
- "PO-Revision-Date: 2017-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19:15+0200\n"
++"PO-Revision-Date: 2017-07-28 19: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
++#: agent/call-pinentry.c:300
+#, 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
++#: agent/call-pinentry.c:503
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
+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
++#: agent/call-pinentry.c:511
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
+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
++#: agent/call-pinentry.c:844
+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
++#: agent/call-pinentry.c:865
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
+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
++#: agent/call-pinentry.c:996
+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
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+msgid "PIN:"
+msgstr "PIN:"
+
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 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
++#: agent/call-pinentry.c:1080
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
+msgid "Repeat:"
+msgstr "Repeat:"
+
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
+msgid "PIN too long"
+msgstr "PIN too long"
+
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
+msgid "PIN too short"
+msgstr "PIN too short"
+
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
+#: 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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
+#, 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:2473
++#: agent/command-ssh.c:2487
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
+#, c-format
+msgid "error getting list of cards: %s\n"
+msgstr "error getting list of cards: %s\n"
+
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
+#, 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:2781
++#: agent/command-ssh.c:2795
+msgid "Allow"
+msgstr "Allow"
+
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
+msgid "Deny"
+msgstr "Deny"
+
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
+#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
+#, 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:3635
++#: agent/command-ssh.c:3660
+#, 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
++#: agent/divert-scd.c:117
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
+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
++#: agent/divert-scd.c:246
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
+msgid "PUK"
+msgstr "PUK"
+
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
+msgid "Reset Code"
+msgstr "Reset Code"
+
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
+#, 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
++#: agent/divert-scd.c:356
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
+msgid "Reset Code not correctly repeated; try again"
+msgstr "Reset Code not correctly repeated; try again"
+
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
+#, 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
++#: agent/gpg-agent.c:151 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
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
+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
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
+msgid "run in supervised mode"
+msgstr "run in supervised mode"
+
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: 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
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
+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
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 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
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 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
++#: agent/gpg-agent.c:175
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “[1mtrusted[0m”"
+
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:237
++msgid "|ALGO|use ALGO to show ssh fingerprints"
++msgstr "|ALGO|use ALGO to show ssh fingerprints"
++
++#: agent/gpg-agent.c:240
+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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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
++#: agent/gpg-agent.c:505
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
+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:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
+#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
++msgid "selected digest algorithm is invalid\n"
++msgstr "selected digest algorithm is invalid\n"
++
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
+#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
+#, 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
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
+#, 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
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
+#, 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
++#: agent/gpg-agent.c:2190
+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
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
+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
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
+#, 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
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
+#, 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
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
+#, 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
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
+#, 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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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
++#: agent/gpg-agent.c:2304
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
+#, 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
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
+#, 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
++#: agent/gpg-agent.c:2667
+#, 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
++#: agent/gpg-agent.c:2672
+#, 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
++#: agent/gpg-agent.c:2747
+#, 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
++#: agent/gpg-agent.c:2752
+#, 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:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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
++#: agent/preset-passphrase.c:100
+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
++#: agent/preset-passphrase.c:103
+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:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
+#, 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:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: 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:1490
++#: agent/findkey.c:1491
+#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
+msgid "Delete key"
+msgstr "Delete key"
+
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
+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
++#: agent/pksign.c:523
+#, 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
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
+#, 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
++#: common/miscellaneous.c:115 g10/card-util.c:859 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
++#: common/miscellaneous.c:617
+#, 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
++#: scd/app-openpgp.c:3273
+#, 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
++#: common/argparse.c:391 g10/gpg.c:3475
+#, 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
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
+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
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
+#, 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
++#: g10/call-agent.c:144 sm/call-agent.c:218
+#, 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
++#: g10/call-agent.c:199 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
++#: g10/call-agent.c:205 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
++#: g10/call-agent.c:211 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
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
++#, c-format
++msgid "%s is not compliant with %s mode\n"
++msgstr "%s is not compliant with %s mode\n"
++
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
+#, 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
++#: g10/card-util.c:91 g10/card-util.c:1751
+#, 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/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: 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
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
+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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
+#, 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:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
- #: g10/card-util.c:937
++#: g10/card-util.c:928
+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
++#: g10/card-util.c:966
+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
++#: g10/card-util.c:1051
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
+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
++#: g10/card-util.c:1342
+#, 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
++#: g10/card-util.c:1344
+#, 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
++#: g10/card-util.c:1345
+#, 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
++#: g10/card-util.c:1356 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
++#: g10/card-util.c:1364 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
++#: g10/card-util.c:1369
+#, 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
++#: g10/card-util.c:1389
+#, 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
++#: g10/card-util.c:1413
+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
++#: g10/card-util.c:1427
+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
++#: g10/card-util.c:1430
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
+#, 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
++#: g10/card-util.c:1502
+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
++#: g10/card-util.c:1504 g10/card-util.c:1618
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
+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/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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
++#: g10/card-util.c:1615
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
+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
++#: g10/card-util.c:1762
+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
++#: g10/card-util.c:1765
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
+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
++#: g10/card-util.c:1856 g10/keyedit.c:1258
+msgid "quit this menu"
+msgstr "quit this menu"
+
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
+msgid "show this help"
+msgstr "show this help"
+
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
+msgid "list all available data"
+msgstr "list all available data"
+
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
+msgid "change the login name"
+msgstr "change the login name"
+
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
+msgid "generate new keys"
+msgstr "generate new keys"
+
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
+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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
+#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
+#, 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
++#: g10/encrypt.c:244 g10/sign.c:1336
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
+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
++#: g10/encrypt.c:265
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
+#, 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
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n"
+
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
+#, 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
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#, c-format
++msgid "cipher algorithm '%s' may not be used in %s mode\n"
++msgstr "cipher algorithm ‘[1m%s[0m’ may not be used in %s mode\n"
++
++#: g10/encrypt.c:661 sm/encrypt.c:489
++#, c-format
++msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
++msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
++
++#: g10/encrypt.c:772 g10/sign.c:1028
+#, 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
++#: g10/encrypt.c:882
+#, 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
++#: g10/encrypt.c:970
+#, 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
++#: g10/encrypt.c:998 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"
++msgid "option '%s' may not be used in %s mode\n"
++msgstr "option ‘[1m%s[0m’ may not be used in %s mode\n"
+
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
+#, 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
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
+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
++#: g10/decrypt-data.c:188
+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
++#: g10/export.c:1236
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘[1m%s[0m’\n"
+
- #: g10/export.c:1708
++#: g10/export.c:1709
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1903
++#: g10/export.c:1904
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1980
++#: g10/export.c:1981
+#, 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
++#: g10/export.c:2068
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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: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: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: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: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:1991
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘[1m%s[0m’ ignored\n"
+
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
+#, 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:3637
++#: g10/getkey.c:3658
+#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
++#, c-format
++msgid "valid values for option '%s':\n"
++msgstr "valid values for option '%s':\n"
++
++#: g10/gpg.c:433 sm/gpgsm.c:201
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:434
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:436
++#: g10/gpg.c:439
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:447
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:447
++#: g10/gpg.c:450
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:455
++#: g10/gpg.c:458
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:458
++#: g10/gpg.c:461
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:463
++#: g10/gpg.c:466
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:469
+msgid "quickly set a new expiration date"
+msgstr "quickly set a new expiration date"
+
- #: g10/gpg.c:469
++#: g10/gpg.c:472
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:472
++#: g10/gpg.c:475
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:477
++#: g10/gpg.c:480
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:479
++#: g10/gpg.c:482
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:481
++#: g10/gpg.c:484
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:482
++#: g10/gpg.c:485
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:483
++#: g10/gpg.c:486
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:484
++#: g10/gpg.c:487
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:490
++#: g10/gpg.c:493
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:491
++#: g10/gpg.c:494
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:492
++#: g10/gpg.c:495
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:495
++#: g10/gpg.c:498
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:497
++#: g10/gpg.c:500
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:503
++#: g10/gpg.c:506
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:506
++#: g10/gpg.c:509
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:507
++#: g10/gpg.c:510
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:509
++#: g10/gpg.c:512
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:521
++#: g10/gpg.c:524
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:530
++#: g10/gpg.c:533
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:535
++#: g10/gpg.c:538
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
- #: g10/gpg.c:564
++#: g10/gpg.c:567
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:571
++#: g10/gpg.c:574
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:604
++#: g10/gpg.c:607
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:653
++#: g10/gpg.c:657
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
+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:682
++#: g10/gpg.c:686
+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:1052
++#: g10/gpg.c:1057
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
+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:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
+#, 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:1563
++#: g10/gpg.c:1568
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
+#, 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:1569
++#: g10/gpg.c:1574
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
+#, 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:1581
++#: g10/gpg.c:1586
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
+#, 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:1590
++#: g10/gpg.c:1595
+#, 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:1593
++#: g10/gpg.c:1598
+#, 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:1599
++#: g10/gpg.c:1604
+#, 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:1602
++#: g10/gpg.c:1607
+#, 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:1605
++#: g10/gpg.c:1610
+#, 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:1821
++#: g10/gpg.c:1826
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: 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:2069
++#: g10/gpg.c:2074
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “[1mhelp[0m” to list choices)\n"
+
- #: 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:2244
++#: g10/gpg.c:2227
+#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
+#, 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:3055
++#: g10/gpg.c:3054
+#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
+#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
+#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: 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:3720
++#: g10/gpg.c:3725
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
+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:3747
++#: g10/gpg.c:3752
+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:3749
++#: g10/gpg.c:3754
+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:3752
++#: g10/gpg.c:3757
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
+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:3763
++#: g10/gpg.c:3768
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3858
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+#, 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"
++msgid "digest algorithm '%s' may not be used in %s mode\n"
++msgstr "digest algorithm ‘[1m%s[0m’ may not be used in %s mode\n"
+
- #: g10/gpg.c:3863
++#: g10/gpg.c:3875
+#, 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"
++msgid "compression algorithm '%s' may not be used in %s mode\n"
++msgstr "compression algorithm ‘[1m%s[0m’ may not be used in %s mode\n"
+
- #: 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:3972
++#: g10/gpg.c:4015
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
+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:4056
++#: g10/gpg.c:4099
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
+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:4088
++#: g10/gpg.c:4131
+#, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
- msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
++msgid "you cannot use --symmetric --encrypt in %s mode\n"
++msgstr "you cannot use --symmetric --encrypt in %s mode\n"
+
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
+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:4148
++#: g10/gpg.c:4192
+#, 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"
++msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
++msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
+
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
+#, 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:4931
++#: g10/gpg.c:4977
+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:4942
++#: g10/gpg.c:4988
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
+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
++#: g10/gpgv.c:84 sm/gpgsm.c:348
+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
++#: g10/import.c:160
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
- #: g10/import.c:155
++#: g10/import.c:163
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
- #: g10/import.c:158
++#: g10/import.c:166
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
- #: g10/import.c:161
++#: g10/import.c:169
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:164
++#: g10/import.c:172
+msgid "show key during import"
+msgstr "show key during import"
+
- #: g10/import.c:167
++#: g10/import.c:175
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:170
++#: g10/import.c:178
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:173
++#: g10/import.c:181
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
- #: g10/import.c:176
++#: g10/import.c:184
+msgid "run import filters and export key immediately"
+msgstr "run import filters and export key immediately"
+
- #: g10/import.c:179
++#: g10/import.c:187
+msgid "assume the GnuPG key backup format"
+msgstr "assume the GnuPG key backup format"
+
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
++msgid "repair keys on import"
++msgstr "repair keys on import"
++
++#: g10/import.c:352 g10/import.c:590
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:601
++#: g10/import.c:607
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:671
++#: g10/import.c:677
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:674
++#: g10/import.c:680
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:676
++#: g10/import.c:682
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:679
++#: g10/import.c:685
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:688
++#: g10/import.c:694
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:690
++#: g10/import.c:696
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:692
++#: g10/import.c:698
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:694
++#: g10/import.c:700
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 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
++#: g10/import.c:704 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
++#: g10/import.c:706 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
++#: g10/import.c:708 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:704
++#: g10/import.c:710
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:706
++#: g10/import.c:712
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:1059
++#: g10/import.c:1065
+#, 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
++#: g10/import.c:1107
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:1116
++#: g10/import.c:1122
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
- #: g10/import.c:1128
++#: g10/import.c:1134
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
- #: g10/import.c:1141
++#: g10/import.c:1147
+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
++#: g10/import.c:1149
+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
++#: g10/import.c:1174
+#, 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
++#: g10/import.c:1661 g10/import.c:2494
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:1449
++#: g10/import.c:1667
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1482
++#: g10/import.c:1700
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1500
++#: g10/import.c:1721
+#, 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
++#: g10/import.c:1731 g10/import.c:1762
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1512
++#: g10/import.c:1733
+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
++#: g10/import.c:1803 g10/import.c:2645
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1588
++#: g10/import.c:1809
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1603
++#: g10/import.c:1825
+#, 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
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1632
++#: g10/import.c:1872
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
- #: g10/import.c:1656
++#: g10/import.c:1897
+#, 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
++#: g10/import.c:1913 g10/import.c:2669
+#, 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
++#: g10/import.c:1921 g10/import.c:2676
+#, 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
++#: g10/import.c:1980
+#, 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
++#: g10/import.c:1983
+#, 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
++#: g10/import.c:1986
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
- #: g10/import.c:1732
++#: g10/import.c:1989
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
- #: g10/import.c:1735
++#: g10/import.c:1992
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
- #: g10/import.c:1738
++#: g10/import.c:1995
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
- #: g10/import.c:1741
++#: g10/import.c:1998
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
- #: g10/import.c:1744
++#: g10/import.c:2001
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
- #: g10/import.c:1747
++#: g10/import.c:2004
+#, 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
++#: g10/import.c:2007
+#, 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
++#: g10/import.c:2033
+#, 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
++#: g10/import.c:2346 g10/import.c:2591
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:2093
++#: g10/import.c:2354
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:2101
++#: g10/import.c:2362
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:2206
++#: g10/import.c:2467
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:2250
++#: g10/import.c:2511
+#, 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
++#: g10/import.c:2583
+#, 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
++#: g10/import.c:2638
+#, 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
++#: g10/import.c:2687
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:2459
++#: g10/import.c:2720
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
- #: g10/import.c:2535
++#: g10/import.c:2796
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2552
++#: g10/import.c:2813
+#, 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
++#: g10/import.c:2815
+#, 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
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2572
++#: g10/import.c:2833
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2586
++#: g10/import.c:2847
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2599
++#: g10/import.c:2860
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2615
++#: g10/import.c:2876
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2637
++#: g10/import.c:2898
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2650
++#: g10/import.c:2911
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2665
++#: g10/import.c:2926
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2708
++#: g10/import.c:2969
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
- #: g10/import.c:2732
++#: g10/import.c:2993
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2761
++#: g10/import.c:3022
+#, 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
++#: g10/import.c:3033
+#, 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
++#: g10/import.c:3051
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2804
++#: g10/import.c:3065
+#, 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
++#: g10/import.c:3073
+#, 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
++#: g10/import.c:3215
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:3018
++#: g10/import.c:3279
+#, 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
++#: g10/import.c:3295
+#, 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
++#: g10/import.c:3361
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
- #: g10/import.c:3136
++#: g10/import.c:3399
+#, 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
++#: g10/keyedit.c:260
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: 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
++#: g10/keyedit.c:383 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
++#: g10/keyedit.c:387 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
++#: g10/keyedit.c:388 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
+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
++#: g10/keyedit.c:423
+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
++#: g10/keyedit.c:551
+#, 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
++#: g10/keyedit.c:559
+#, 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
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
+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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “[1m%s[0m” is not self-signed."
+
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
+#, 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
++#: g10/keyedit.c:682
+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
++#: g10/keyedit.c:695
+#, 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
++#: g10/keyedit.c:700
+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
++#: g10/keyedit.c:721
+#, 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
++#: g10/keyedit.c:726
+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
++#: g10/keyedit.c:746
+#, 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
++#: g10/keyedit.c:750
+#, 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
++#: g10/keyedit.c:755
+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
++#: g10/keyedit.c:777
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
+#, 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
++#: g10/keyedit.c:825
+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
++#: g10/keyedit.c:866
+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
++#: g10/keyedit.c:871
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
+#, 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
++#: g10/keyedit.c:875
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
+#, 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
++#: g10/keyedit.c:885
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
+#, 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
++#: g10/keyedit.c:920
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
+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
++#: g10/keyedit.c:932
+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
++#: g10/keyedit.c:942
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
+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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
+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
++#: g10/keyedit.c:1146
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
+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
++#: g10/keyedit.c:1308
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
+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
++#: g10/keyedit.c:1319
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
+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
++#: g10/keyedit.c:1341
+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
++#: g10/keyedit.c:1453
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
+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
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
+#, 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
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
+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
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘[1m%s[0m’ command.)\n"
+
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
+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
++#: g10/keyedit.c:1790
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
+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
++#: g10/keyedit.c:1913
+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
++#: g10/keyedit.c:1951
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
+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
++#: g10/keyedit.c:1981
+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
++#: g10/keyedit.c:1983
+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
++#: g10/keyedit.c:2041
+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
++#: g10/keyedit.c:2086
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
+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
++#: g10/keyedit.c:2095
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
+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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
+#, 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
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
+msgid "cannot revoke the last valid user ID.\n"
+msgstr "cannot revoke the last valid user ID.\n"
+
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
+#, c-format
+msgid "revoking the user ID failed: %s\n"
+msgstr "revoking the user ID failed: %s\n"
+
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
+#, c-format
+msgid "setting the primary user ID failed: %s\n"
+msgstr "setting the primary user ID failed: %s\n"
+
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“[1m%s[0m” is not a fingerprint\n"
+
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
+#, 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
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
+#, 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
++#: g10/keyedit.c:2905
++#, c-format
++msgid "\"%s\" is not a proper fingerprint\n"
++msgstr "“[1m%s[0m” is not a proper fingerprint\n"
++
++#: g10/keyedit.c:2929
++#, c-format
++msgid "subkey \"%s\" not found\n"
++msgstr "subkey “[1m%s[0m” not found\n"
++
++#: g10/keyedit.c:3052
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
+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
++#: g10/keyedit.c:3461
+#, 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
++#: g10/keyedit.c:3485
+#, 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
++#: g10/keyedit.c:3491
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
+#, 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/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
+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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
+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
++#: g10/keyedit.c:3865
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
+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
++#: g10/keyedit.c:3925
+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
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
+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
++#: g10/keyedit.c:3936
+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
++#: g10/keyedit.c:3951 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
++#: g10/keyedit.c:4053
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
+#, 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
++#: g10/keyedit.c:4094
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
+#, 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
++#: g10/keyedit.c:4145
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
+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
++#: g10/keyedit.c:4226
+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
++#: g10/keyedit.c:4243
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
+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
++#: g10/keyedit.c:4283
+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
++#: g10/keyedit.c:4305
+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
++#: g10/keyedit.c:4323
+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
++#: g10/keyedit.c:4329
+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
++#: g10/keyedit.c:4397
+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
++#: g10/keyedit.c:4402
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
+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
++#: g10/keyedit.c:4640
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
+#, 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
++#: g10/keyedit.c:4763
+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
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
+#, 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
++#: g10/keyedit.c:4975
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
+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
++#: g10/keyedit.c:5055
+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
++#: g10/keyedit.c:5115
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
+#, 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
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
+#, 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
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
+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
++#: g10/keyedit.c:5677
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
+#, 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
++#: g10/keyedit.c:5766
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
+#, 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
++#: g10/keyedit.c:5912
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
+#, 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
++#: g10/keyedit.c:6025
+msgid "Cannot revoke the last valid user ID.\n"
+msgstr "Cannot revoke the last valid user ID.\n"
+
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
+#, 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:168
++#, c-format
++msgid "invalid value for option '%s'\n"
++msgstr "invalid value for option ‘[1m%s[0m’\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
+#, 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
++#: g10/keygen.c:4823
+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
++#: g10/keygen.c:4969 g10/keygen.c:5155
+#, 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
++#: g10/keygen.c:4971 g10/keygen.c:5157
+#, 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
++#: g10/keygen.c:4982 g10/keygen.c:5168
+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
++#: g10/keygen.c:4994 g10/keygen.c:4996
+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
++#: g10/keygen.c:5003 g10/keygen.c:5005
+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
++#: g10/keygen.c:5024 g10/keygen.c:5182
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:330
++#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:332
++#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:372
++#: g10/keylist.c:373
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:425
++#: g10/keylist.c:426
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:427
++#: g10/keylist.c:428
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:473
++#: g10/keylist.c:474
+#, 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
++#: g10/keylist.c:478
++#, 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/keylist.c:482
++#, 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/keylist.c:487
+#, 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
++#: g10/keylist.c:569
+#, 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
++#: g10/keylist.c:591
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
+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
++#: g10/keylist.c:1815
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
+#: g10/keyring.c:1467
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘[1m%s[0m’\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 keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
+#: 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: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: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
++#: g10/keyserver.c:1709
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “[1m%s[0m”: %s\n"
+
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘[1m%s[0m’\n"
+
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
+#, 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
++#: g10/mainproc.c:303
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
+#, 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
++#: g10/mainproc.c:494 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “[1m%s[0m”\n"
+
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
+#, 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
++#: g10/mainproc.c:659 g10/mainproc.c:673
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “[1mfor-your-eyes-only[0m”\n"
+
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
+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
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
+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
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
+#, 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
++#: g10/mainproc.c:1808
+#, c-format
+msgid " issuer \"%s\"\n"
+msgstr " issuer “[1m%s[0m”\n"
+
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
++#, c-format
++msgid "WARNING: This key is not suitable for signing in %s mode\n"
++msgstr "WARNING: This key is not suitable for signing in %s mode\n"
++
++#: g10/mainproc.c:2194
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
+#, 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
++#: g10/mainproc.c:2287
+#, 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
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
+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
++#: g10/mainproc.c:2442
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
+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:1147
++#: g10/misc.c:1059
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
- #: g10/misc.c:1151
++#: g10/misc.c:1063
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated option\n"
+
- #: g10/misc.c:1153
++#: g10/misc.c:1065
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
- #: g10/misc.c:1160
++#: g10/misc.c:1072
+#, 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:1170
++#: g10/misc.c:1082
+#, 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:1174
++#: g10/misc.c:1086
+#, 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:1238
++#: g10/misc.c:1150
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1388
++#: g10/misc.c:1282
+#, 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:1563
++#: g10/misc.c:1457
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1588
++#: g10/misc.c:1482
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1826
++#: g10/misc.c:1720
+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:1848
++#: g10/misc.c:1742
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:78
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘[1m%s[0m’ exists. "
+
+#: g10/openfile.c:82
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:117
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:212
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:360
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘[1m%s[0m’\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:1187
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: 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
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
++#, c-format
++msgid "Note: key %s is not suitable for encryption in %s mode\n"
++msgstr "Note: key %s is not suitable for encryption in %s mode\n"
++
++#: g10/pubkey-enc.c:128
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
+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
++#: g10/pubkey-enc.c:332
+#, 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
++#: g10/pubkey-enc.c:376
+#, 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
++#: g10/pubkey-enc.c:409
+#, 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
++#: g10/pubkey-enc.c:416
+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
++#: g10/seskey.c:62 sm/encrypt.c:124
+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
++#: g10/sig-check.c:153
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
++#, c-format
++msgid "key %s may not be used for signing in %s mode\n"
++msgstr "key %s may not be used for signing in %s mode\n"
++
++#: g10/sig-check.c:191
+#, 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
++#: g10/sig-check.c:193
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
+#, 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
++#: g10/sig-check.c:324
+#, 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
++#: g10/sig-check.c:333
+#, 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
++#: g10/sig-check.c:347 g10/sign.c:267
+#, 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
++#: g10/sig-check.c:356
+#, 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
++#: g10/sig-check.c:373
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
+#, 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
++#: g10/sig-check.c:518
+#, 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
++#: g10/sig-check.c:1109
+#, 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
++#: g10/sig-check.c:1112
+#, 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
++#: g10/sign.c:89
+#, 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
++#: g10/sign.c:115
+#, 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
++#: g10/sign.c:138
+#, 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
++#: g10/sign.c:363
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “[1m%s[0m”\n"
+
- #: g10/sign.c:890
++#: g10/sign.c:922
+#, 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
++#: g10/sign.c:1053
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1298
++#: g10/sign.c:1330
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
+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:213
++#: g10/skclist.c:205
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
- #: g10/skclist.c:232
++#: g10/skclist.c:224
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:251
++#: g10/skclist.c:243
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: 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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
+#, 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
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
+#, 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
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
+#, 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
++#: g10/tofu.c:354 g10/tofu.c:887
+#, 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
++#: g10/tofu.c:504
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
- #: g10/tofu.c:538
++#: g10/tofu.c:537
+#, 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
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
+msgid "TOFU DB error"
+msgstr "TOFU DB error"
+
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
+#, 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
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
+#, c-format
+msgid "error initializing TOFU database: %s\n"
+msgstr "error initializing TOFU database: %s\n"
+
- #: g10/tofu.c:844
++#: g10/tofu.c:843
+#, c-format
+msgid "error creating 'encryptions' TOFU table: %s\n"
+msgstr "error creating ‘[1mencryptions[0m’ TOFU table: %s\n"
+
- #: g10/tofu.c:874
++#: g10/tofu.c:873
+#, 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
++#: g10/tofu.c:955
+#, 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:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
+#, 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
++#: g10/tofu.c:1336
+#, 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
++#: g10/tofu.c:1342
+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
++#: g10/tofu.c:1348
+#, 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:1609
++#: g10/tofu.c:1608
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
+msgid "This key's user IDs:\n"
+msgstr "This key's user IDs:\n"
+
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
+#, 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:1748
++#: g10/tofu.c:1747
+#, 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:1798
++#: g10/tofu.c:1797
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
+#, c-format
+msgid "Verified %d message."
+msgid_plural "Verified %d messages."
+msgstr[0] "Verified %d message."
+msgstr[1] "Verified %d messages."
+
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
+#, c-format
+msgid "Encrypted %d message."
+msgid_plural "Encrypted %d messages."
+msgstr[0] "Encrypted %d message."
+msgstr[1] "Encrypted %d messages."
+
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
+#, 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:1839
++#: g10/tofu.c:1838
+#, 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:1853
++#: g10/tofu.c:1852
+#, 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:1859
++#: g10/tofu.c:1858
+#, 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:1869
++#: g10/tofu.c:1868
+#, 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:1875
++#: g10/tofu.c:1874
+#, 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:1885
++#: g10/tofu.c:1884
+#, 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:1891
++#: g10/tofu.c:1890
+#, 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:1899
++#: g10/tofu.c:1898
+#, c-format
+msgid "Messages verified in the past: %d."
+msgstr "Messages verified in the past: %d."
+
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
+#, 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:1920
++#: g10/tofu.c:1919
+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:1962
++#: g10/tofu.c:1961
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
+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:1976
++#: g10/tofu.c:1975
+msgid "Defaulting to unknown.\n"
+msgstr "Defaulting to unknown.\n"
+
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
+msgid "TOFU db corruption detected.\n"
+msgstr "TOFU db corruption detected.\n"
+
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
+#, c-format
+msgid "resetting keydb: %s\n"
+msgstr "resetting keydb: %s\n"
+
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
+#, 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:2827
++#: g10/tofu.c:2826
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
+#, c-format
+msgid "%lld~year"
+msgid_plural "%lld~years"
+msgstr[0] "%lld~year"
+msgstr[1] "%lld~years"
+
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
+#, c-format
+msgid "%lld~month"
+msgid_plural "%lld~months"
+msgstr[0] "%lld~month"
+msgstr[1] "%lld~months"
+
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
+#, c-format
+msgid "%lld~week"
+msgid_plural "%lld~weeks"
+msgstr[0] "%lld~week"
+msgstr[1] "%lld~weeks"
+
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
+#, c-format
+msgid "%lld~day"
+msgid_plural "%lld~days"
+msgstr[0] "%lld~day"
+msgstr[1] "%lld~days"
+
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
+#, c-format
+msgid "%lld~hour"
+msgid_plural "%lld~hours"
+msgstr[0] "%lld~hour"
+msgstr[1] "%lld~hours"
+
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
+#, c-format
+msgid "%lld~minute"
+msgid_plural "%lld~minutes"
+msgstr[0] "%lld~minute"
+msgstr[1] "%lld~minutes"
+
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
+#, c-format
+msgid "%lld~second"
+msgid_plural "%lld~seconds"
+msgstr[0] "%lld~second"
+msgstr[1] "%lld~seconds"
+
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
+#, c-format
+msgid "%s: Verified 0~signatures and encrypted 0~messages."
+msgstr "%s: Verified 0~signatures and encrypted 0~messages."
+
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
+#, c-format
+msgid "%s: Verified 0 signatures."
+msgstr "%s: Verified 0 signatures."
+
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
+#, 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:3168
++#: g10/tofu.c:3166
+msgid "Encrypted 0 messages."
+msgstr "Encrypted 0 messages."
+
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
+#, 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:3187
++#: g10/tofu.c:3185
+#, c-format
+msgid "(policy: %s)"
+msgstr "(policy: %s)"
+
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
+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:3224
++#: g10/tofu.c:3222
+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:3228
++#: g10/tofu.c:3226
+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:3231
++#: g10/tofu.c:3229
+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:3260
++#: g10/tofu.c:3258
+#, 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: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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
+#, 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:3917
++#: g10/tofu.c:3915
+#, 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
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
+#, 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
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
+#, 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 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
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 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
++#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
+#, 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
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
+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
++#: scd/app-openpgp.c:1469
+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
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
+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
++#: scd/app-openpgp.c:1669
+#, 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
++#: scd/app-openpgp.c:2008
+#, c-format
+msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+msgstr "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
+#, 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
++#: scd/app-openpgp.c:2037
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
+#, 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
++#: scd/app-openpgp.c:2113
+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
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
+#, 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
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
+#, 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
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
+#, 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
++#: scd/app-openpgp.c:2260
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
+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
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
+#, 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
++#: scd/app-openpgp.c:2668
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
+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
++#: scd/app-openpgp.c:2741
+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
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
+#, 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
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
+#, 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
++#: scd/app-openpgp.c:4023
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
+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
++#: scd/app-openpgp.c:4189
+#, 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
++#: scd/app-openpgp.c:4274
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
+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
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
+#, 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
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
+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
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
+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
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
+#, 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
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
+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
++#: sm/certcheck.c:244 sm/verify.c:210
+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
++#: sm/certlist.c:132 sm/keylist.c:275 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
++#: sm/decrypt.c:341
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
+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
++#: sm/encrypt.c:330
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
+msgid "list external keys"
+msgstr "list external keys"
+
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
+msgid "import certificates"
+msgstr "import certificates"
+
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
+msgid "export certificates"
+msgstr "export certificates"
+
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
+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
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
+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
++#: sm/gpgsm.c:767
+#, 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
++#: sm/gpgsm.c:778
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘[1m%s[0m’\n"
+
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 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
++#: sm/gpgsm.c:848 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
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘[1m%s[0m’\n"
+
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
+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
++#: sm/keylist.c:670
+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
++#: sm/qualified.c:215 sm/verify.c:653
+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
++#: sm/sign.c:465
+#, 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
++#: sm/sign.c:508
+#, 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
++#: sm/sign.c:560
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
- #: sm/verify.c:457
++#: sm/verify.c:486
+msgid "Signature made "
+msgstr "Signature made "
+
- #: sm/verify.c:461
++#: sm/verify.c:490
+msgid "[date not given]"
+msgstr "[date not given]"
+
- #: sm/verify.c:462
++#: sm/verify.c:491
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
- #: sm/verify.c:481
++#: sm/verify.c:510
+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
++#: sm/verify.c:631
+msgid "Good signature from"
+msgstr "Good signature from"
+
- #: sm/verify.c:603
++#: sm/verify.c:632
+msgid " aka"
+msgstr " aka"
+
- #: sm/verify.c:621
++#: sm/verify.c:650
+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: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
++#: dirmngr/dirmngr.c:166
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
+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
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
+msgid "allow online software version check"
+msgstr "allow online software version check"
+
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
+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
++#: dirmngr/dirmngr.c:213 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
++#: dirmngr/dirmngr.c:216
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
+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
++#: dirmngr/dirmngr.c:229
+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
++#: dirmngr/dirmngr.c:231
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
+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
++#: dirmngr/dirmngr.c:392
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
+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
++#: dirmngr/dirmngr.c:474
+#, 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
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
+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
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
+#, 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
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
+#, 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
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
+#, 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
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
+#, 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
++#: dirmngr/dirmngr.c:1838
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
+#, 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/http.c:1901 dirmngr/ocsp.c:242
++#, c-format
++msgid "error accessing '%s': http status %u\n"
++msgstr "error accessing '%s': http status %u\n"
++
++#: 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"
++
+#: 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
++#: dirmngr/ldap.c:618
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘[1m%s[0m’\n"
+
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
+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
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
+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
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
+#, 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
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
+#, 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
++#: dirmngr/server.c:2663
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
+#, 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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
+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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
+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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
+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
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
+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
++#: tools/gpgconf-comp.c:544
+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
++#: tools/gpgconf-comp.c:568
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
+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
++#: tools/gpgconf-comp.c:579
+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
++#: tools/gpgconf-comp.c:583
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
+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
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
+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
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
+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
++#: tools/gpgconf-comp.c:807
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
+msgid "Private Keys"
+msgstr "Private Keys"
+
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
+msgid "Smartcards"
+msgstr "Smartcards"
+
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
+msgid "S/MIME"
+msgstr "S/MIME"
+
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
+msgid "Network"
+msgstr "Network"
+
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
+msgid "Passphrase Entry"
+msgstr "Passphrase Entry"
+
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
+#, c-format
+msgid "error closing '%s'\n"
+msgstr "error closing ‘[1m%s[0m’\n"
+
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
+#, 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
++#: tools/gpgconf.c:128
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
+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
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
+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 b2dcbf3,0000000..9f22932
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10688 -1,0 +1,10675 @@@
+# 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.21\n"
++"Project-Id-Version: GNU gnupg 2.1.22\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-05-15 16:15+0200\n"
- "PO-Revision-Date: 2017-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19:15+0200\n"
++"PO-Revision-Date: 2017-07-28 19: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
++#: agent/call-pinentry.c:300
+#, 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
++#: agent/call-pinentry.c:503
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
+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
++#: agent/call-pinentry.c:511
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
+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
++#: agent/call-pinentry.c:844
+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
++#: agent/call-pinentry.c:865
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
+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
++#: agent/call-pinentry.c:996
+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
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+msgid "PIN:"
+msgstr "PIN:"
+
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 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
++#: agent/call-pinentry.c:1080
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
+msgid "Repeat:"
+msgstr "Repeat:"
+
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
+msgid "PIN too long"
+msgstr "PIN too long"
+
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
+msgid "PIN too short"
+msgstr "PIN too short"
+
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
+#: 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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
+#, 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:2473
++#: agent/command-ssh.c:2487
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
+#, c-format
+msgid "error getting list of cards: %s\n"
+msgstr "error getting list of cards: %s\n"
+
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
+#, 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:2781
++#: agent/command-ssh.c:2795
+msgid "Allow"
+msgstr "Allow"
+
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
+msgid "Deny"
+msgstr "Deny"
+
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
+#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
+#, 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:3635
++#: agent/command-ssh.c:3660
+#, 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
++#: agent/divert-scd.c:117
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
+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
++#: agent/divert-scd.c:246
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
+msgid "PUK"
+msgstr "PUK"
+
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
+msgid "Reset Code"
+msgstr "Reset Code"
+
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
+#, 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
++#: agent/divert-scd.c:356
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
+msgid "Reset Code not correctly repeated; try again"
+msgstr "Reset Code not correctly repeated; try again"
+
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
+#, 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
++#: agent/gpg-agent.c:151 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
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
+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
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
+msgid "run in supervised mode"
+msgstr "run in supervised mode"
+
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: 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
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
+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
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 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
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 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
++#: agent/gpg-agent.c:175
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “trusted”"
+
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:237
++msgid "|ALGO|use ALGO to show ssh fingerprints"
++msgstr "|ALGO|use ALGO to show ssh fingerprints"
++
++#: agent/gpg-agent.c:240
+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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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
++#: agent/gpg-agent.c:505
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
+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:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘%s’ given\n"
+
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
++msgid "selected digest algorithm is invalid\n"
++msgstr "selected digest algorithm is invalid\n"
++
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
+#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
+#, 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
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
+#, 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
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘%s’ is too long\n"
+
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
+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
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
+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
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
+#, 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
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
+#, 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
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
+#, 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
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
+#, 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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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
++#: agent/gpg-agent.c:2304
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
+#, 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
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
+#, 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
++#: agent/gpg-agent.c:2667
+#, 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
++#: agent/gpg-agent.c:2672
+#, 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
++#: agent/gpg-agent.c:2747
+#, 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
++#: agent/gpg-agent.c:2752
+#, 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:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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
++#: agent/preset-passphrase.c:100
+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
++#: agent/preset-passphrase.c:103
+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:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
+#, 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:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: 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:1490
++#: agent/findkey.c:1491
+#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
+msgid "Delete key"
+msgstr "Delete key"
+
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
+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
++#: agent/pksign.c:523
+#, 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
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
+#, 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
++#: common/miscellaneous.c:115 g10/card-util.c:859 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
++#: common/miscellaneous.c:617
+#, 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
++#: scd/app-openpgp.c:3273
+#, 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
++#: common/argparse.c:391 g10/gpg.c:3475
+#, 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
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
+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
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
+#, 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
++#: g10/call-agent.c:144 sm/call-agent.c:218
+#, 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
++#: g10/call-agent.c:199 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
++#: g10/call-agent.c:205 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
++#: g10/call-agent.c:211 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
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
++#, c-format
++msgid "%s is not compliant with %s mode\n"
++msgstr "%s is not compliant with %s mode\n"
++
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
+#, 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
++#: g10/card-util.c:91 g10/card-util.c:1751
+#, 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/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: 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
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
+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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
+#, 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:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
- #: g10/card-util.c:937
++#: g10/card-util.c:928
+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
++#: g10/card-util.c:966
+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
++#: g10/card-util.c:1051
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
+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
++#: g10/card-util.c:1342
+#, 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
++#: g10/card-util.c:1344
+#, 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
++#: g10/card-util.c:1345
+#, 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
++#: g10/card-util.c:1356 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
++#: g10/card-util.c:1364 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
++#: g10/card-util.c:1369
+#, 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
++#: g10/card-util.c:1389
+#, 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
++#: g10/card-util.c:1413
+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
++#: g10/card-util.c:1427
+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
++#: g10/card-util.c:1430
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
+#, 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
++#: g10/card-util.c:1502
+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
++#: g10/card-util.c:1504 g10/card-util.c:1618
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
+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/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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
++#: g10/card-util.c:1615
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
+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
++#: g10/card-util.c:1762
+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
++#: g10/card-util.c:1765
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
+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
++#: g10/card-util.c:1856 g10/keyedit.c:1258
+msgid "quit this menu"
+msgstr "quit this menu"
+
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
+msgid "show this help"
+msgstr "show this help"
+
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
+msgid "list all available data"
+msgstr "list all available data"
+
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
+msgid "change the login name"
+msgstr "change the login name"
+
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
+msgid "generate new keys"
+msgstr "generate new keys"
+
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
+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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
+#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
+#, 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
++#: g10/encrypt.c:244 g10/sign.c:1336
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
+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
++#: g10/encrypt.c:265
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘%s’ is an empty file\n"
+
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘%s’\n"
+
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
+#, 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
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#, c-format
++msgid "cipher algorithm '%s' may not be used in %s mode\n"
++msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
++
++#: g10/encrypt.c:661 sm/encrypt.c:489
++#, c-format
++msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
++msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
++
++#: g10/encrypt.c:772 g10/sign.c:1028
+#, 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
++#: g10/encrypt.c:882
+#, 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
++#: g10/encrypt.c:970
+#, 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
++#: g10/encrypt.c:998 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"
++msgid "option '%s' may not be used in %s mode\n"
++msgstr "option ‘%s’ may not be used in %s mode\n"
+
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
+#, 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
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
+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
++#: g10/decrypt-data.c:188
+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
++#: g10/export.c:1236
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘%s’\n"
+
- #: g10/export.c:1708
++#: g10/export.c:1709
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1903
++#: g10/export.c:1904
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1980
++#: g10/export.c:1981
+#, 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
++#: g10/export.c:2068
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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: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: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: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: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:1991
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘%s’ ignored\n"
+
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
+#, 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:3637
++#: g10/getkey.c:3658
+#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
++#, c-format
++msgid "valid values for option '%s':\n"
++msgstr "valid values for option '%s':\n"
++
++#: g10/gpg.c:433 sm/gpgsm.c:201
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:434
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:436
++#: g10/gpg.c:439
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:447
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:447
++#: g10/gpg.c:450
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:455
++#: g10/gpg.c:458
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:458
++#: g10/gpg.c:461
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:463
++#: g10/gpg.c:466
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:469
+msgid "quickly set a new expiration date"
+msgstr "quickly set a new expiration date"
+
- #: g10/gpg.c:469
++#: g10/gpg.c:472
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:472
++#: g10/gpg.c:475
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:477
++#: g10/gpg.c:480
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:479
++#: g10/gpg.c:482
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:481
++#: g10/gpg.c:484
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:482
++#: g10/gpg.c:485
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:483
++#: g10/gpg.c:486
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:484
++#: g10/gpg.c:487
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:490
++#: g10/gpg.c:493
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:491
++#: g10/gpg.c:494
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:492
++#: g10/gpg.c:495
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:495
++#: g10/gpg.c:498
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:497
++#: g10/gpg.c:500
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:503
++#: g10/gpg.c:506
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:506
++#: g10/gpg.c:509
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:507
++#: g10/gpg.c:510
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:509
++#: g10/gpg.c:512
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:521
++#: g10/gpg.c:524
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:530
++#: g10/gpg.c:533
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:535
++#: g10/gpg.c:538
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
- #: g10/gpg.c:564
++#: g10/gpg.c:567
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:571
++#: g10/gpg.c:574
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:604
++#: g10/gpg.c:607
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:653
++#: g10/gpg.c:657
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
+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:682
++#: g10/gpg.c:686
+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:1052
++#: g10/gpg.c:1057
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
+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:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
+#, c-format
+msgid "no = sign found in group definition '%s'\n"
+msgstr "no = sign found in group definition ‘%s’\n"
+
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
+
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
+
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
+
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
+
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
+#, 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:1590
++#: g10/gpg.c:1595
+#, 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:1593
++#: g10/gpg.c:1598
+#, 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:1599
++#: g10/gpg.c:1604
+#, 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:1602
++#: g10/gpg.c:1607
+#, 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:1605
++#: g10/gpg.c:1610
+#, 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:1821
++#: g10/gpg.c:1826
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: 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:2069
++#: g10/gpg.c:2074
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘%s’\n"
+
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “help” to list choices)\n"
+
- #: 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:2244
++#: g10/gpg.c:2227
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘%s’ ignored\n"
+
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
+#, c-format
+msgid "\"%s\" is not a proper mail address\n"
+msgstr "“%s” is not a proper mail address\n"
+
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘%s’\n"
+
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
+#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: 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:3720
++#: g10/gpg.c:3725
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
+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:3747
++#: g10/gpg.c:3752
+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:3749
++#: g10/gpg.c:3754
+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:3752
++#: g10/gpg.c:3757
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
+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:3763
++#: g10/gpg.c:3768
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3858
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+#, 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"
++msgid "digest algorithm '%s' may not be used in %s mode\n"
++msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
+
- #: g10/gpg.c:3863
++#: g10/gpg.c:3875
+#, 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"
++msgid "compression algorithm '%s' may not be used in %s mode\n"
++msgstr "compression algorithm ‘%s’ may not be used in %s mode\n"
+
- #: g10/gpg.c: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:3972
++#: g10/gpg.c:4015
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
+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:4056
++#: g10/gpg.c:4099
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
+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:4088
++#: g10/gpg.c:4131
+#, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
- msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
++msgid "you cannot use --symmetric --encrypt in %s mode\n"
++msgstr "you cannot use --symmetric --encrypt in %s mode\n"
+
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
+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:4148
++#: g10/gpg.c:4192
+#, 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"
++msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
++msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
+
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
+#, 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:4931
++#: g10/gpg.c:4977
+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:4942
++#: g10/gpg.c:4988
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
+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
++#: g10/gpgv.c:84 sm/gpgsm.c:348
+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
++#: g10/import.c:160
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
- #: g10/import.c:155
++#: g10/import.c:163
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
- #: g10/import.c:158
++#: g10/import.c:166
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
- #: g10/import.c:161
++#: g10/import.c:169
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:164
++#: g10/import.c:172
+msgid "show key during import"
+msgstr "show key during import"
+
- #: g10/import.c:167
++#: g10/import.c:175
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:170
++#: g10/import.c:178
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:173
++#: g10/import.c:181
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
- #: g10/import.c:176
++#: g10/import.c:184
+msgid "run import filters and export key immediately"
+msgstr "run import filters and export key immediately"
+
- #: g10/import.c:179
++#: g10/import.c:187
+msgid "assume the GnuPG key backup format"
+msgstr "assume the GnuPG key backup format"
+
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
++msgid "repair keys on import"
++msgstr "repair keys on import"
++
++#: g10/import.c:352 g10/import.c:590
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:601
++#: g10/import.c:607
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:671
++#: g10/import.c:677
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:674
++#: g10/import.c:680
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:676
++#: g10/import.c:682
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:679
++#: g10/import.c:685
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:688
++#: g10/import.c:694
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:690
++#: g10/import.c:696
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:692
++#: g10/import.c:698
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:694
++#: g10/import.c:700
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 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
++#: g10/import.c:704 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
++#: g10/import.c:706 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
++#: g10/import.c:708 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:704
++#: g10/import.c:710
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:706
++#: g10/import.c:712
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:1059
++#: g10/import.c:1065
+#, 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
++#: g10/import.c:1107
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:1116
++#: g10/import.c:1122
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
- #: g10/import.c:1128
++#: g10/import.c:1134
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
- #: g10/import.c:1141
++#: g10/import.c:1147
+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
++#: g10/import.c:1149
+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
++#: g10/import.c:1174
+#, 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
++#: g10/import.c:1661 g10/import.c:2494
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:1449
++#: g10/import.c:1667
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1482
++#: g10/import.c:1700
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1500
++#: g10/import.c:1721
+#, 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
++#: g10/import.c:1731 g10/import.c:1762
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1512
++#: g10/import.c:1733
+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
++#: g10/import.c:1803 g10/import.c:2645
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1588
++#: g10/import.c:1809
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1603
++#: g10/import.c:1825
+#, 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
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1632
++#: g10/import.c:1872
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
- #: g10/import.c:1656
++#: g10/import.c:1897
+#, 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
++#: g10/import.c:1913 g10/import.c:2669
+#, 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
++#: g10/import.c:1921 g10/import.c:2676
+#, 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
++#: g10/import.c:1980
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
- #: g10/import.c:1726
++#: g10/import.c:1983
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
- #: g10/import.c:1729
++#: g10/import.c:1986
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
- #: g10/import.c:1732
++#: g10/import.c:1989
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
- #: g10/import.c:1735
++#: g10/import.c:1992
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
- #: g10/import.c:1738
++#: g10/import.c:1995
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
- #: g10/import.c:1741
++#: g10/import.c:1998
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
- #: g10/import.c:1744
++#: g10/import.c:2001
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
- #: g10/import.c:1747
++#: g10/import.c:2004
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
- #: g10/import.c:1750
++#: g10/import.c:2007
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
- #: g10/import.c:1773
++#: g10/import.c:2033
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:2093
++#: g10/import.c:2354
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:2101
++#: g10/import.c:2362
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:2206
++#: g10/import.c:2467
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:2250
++#: g10/import.c:2511
+#, 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
++#: g10/import.c:2583
+#, 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
++#: g10/import.c:2638
+#, 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
++#: g10/import.c:2687
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:2459
++#: g10/import.c:2720
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
- #: g10/import.c:2535
++#: g10/import.c:2796
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2552
++#: g10/import.c:2813
+#, 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
++#: g10/import.c:2815
+#, 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
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2572
++#: g10/import.c:2833
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2586
++#: g10/import.c:2847
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2599
++#: g10/import.c:2860
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2615
++#: g10/import.c:2876
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2637
++#: g10/import.c:2898
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2650
++#: g10/import.c:2911
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2665
++#: g10/import.c:2926
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2708
++#: g10/import.c:2969
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
- #: g10/import.c:2732
++#: g10/import.c:2993
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2761
++#: g10/import.c:3022
+#, 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
++#: g10/import.c:3033
+#, 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
++#: g10/import.c:3051
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2804
++#: g10/import.c:3065
+#, 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
++#: g10/import.c:3073
+#, 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
++#: g10/import.c:3215
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:3018
++#: g10/import.c:3279
+#, 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
++#: g10/import.c:3295
+#, 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
++#: g10/import.c:3361
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
- #: g10/import.c:3136
++#: g10/import.c:3399
+#, 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
++#: g10/keyedit.c:260
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: 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
++#: g10/keyedit.c:383 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
++#: g10/keyedit.c:387 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
++#: g10/keyedit.c:388 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
+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
++#: g10/keyedit.c:423
+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
++#: g10/keyedit.c:551
+#, 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
++#: g10/keyedit.c:559
+#, 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
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
+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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “%s” is not self-signed."
+
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
+#, 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
++#: g10/keyedit.c:682
+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
++#: g10/keyedit.c:695
+#, 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
++#: g10/keyedit.c:700
+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
++#: g10/keyedit.c:721
+#, 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
++#: g10/keyedit.c:726
+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
++#: g10/keyedit.c:746
+#, 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
++#: g10/keyedit.c:750
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
+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
++#: g10/keyedit.c:777
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
+#, 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
++#: g10/keyedit.c:825
+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
++#: g10/keyedit.c:866
+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
++#: g10/keyedit.c:871
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
+#, 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
++#: g10/keyedit.c:875
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
+#, 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
++#: g10/keyedit.c:885
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
+#, 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
++#: g10/keyedit.c:920
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
+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
++#: g10/keyedit.c:932
+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
++#: g10/keyedit.c:942
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
+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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
+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
++#: g10/keyedit.c:1146
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
+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
++#: g10/keyedit.c:1308
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
+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
++#: g10/keyedit.c:1319
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
+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
++#: g10/keyedit.c:1341
+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
++#: g10/keyedit.c:1453
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
+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
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
+#, 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
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
+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
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘%s’ command.)\n"
+
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
+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
++#: g10/keyedit.c:1790
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
+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
++#: g10/keyedit.c:1913
+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
++#: g10/keyedit.c:1951
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
+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
++#: g10/keyedit.c:1981
+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
++#: g10/keyedit.c:1983
+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
++#: g10/keyedit.c:2041
+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
++#: g10/keyedit.c:2086
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
+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
++#: g10/keyedit.c:2095
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
+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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
+#, 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
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
+msgid "cannot revoke the last valid user ID.\n"
+msgstr "cannot revoke the last valid user ID.\n"
+
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
+#, c-format
+msgid "revoking the user ID failed: %s\n"
+msgstr "revoking the user ID failed: %s\n"
+
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
+#, c-format
+msgid "setting the primary user ID failed: %s\n"
+msgstr "setting the primary user ID failed: %s\n"
+
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“%s” is not a fingerprint\n"
+
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
+#, 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
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
+#, c-format
+msgid "'%s' is not a valid expiration time\n"
+msgstr "‘%s’ is not a valid expiration time\n"
+
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
++#, c-format
++msgid "\"%s\" is not a proper fingerprint\n"
++msgstr "“%s” is not a proper fingerprint\n"
++
++#: g10/keyedit.c:2929
++#, c-format
++msgid "subkey \"%s\" not found\n"
++msgstr "subkey “%s” not found\n"
++
++#: g10/keyedit.c:3052
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
+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
++#: g10/keyedit.c:3461
+#, 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
++#: g10/keyedit.c:3485
+#, 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
++#: g10/keyedit.c:3491
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
+#, 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/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
+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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
+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
++#: g10/keyedit.c:3865
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
+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
++#: g10/keyedit.c:3925
+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
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
+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
++#: g10/keyedit.c:3936
+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
++#: g10/keyedit.c:3951 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
++#: g10/keyedit.c:4053
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
+#, 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
++#: g10/keyedit.c:4094
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
+#, 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
++#: g10/keyedit.c:4145
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
+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
++#: g10/keyedit.c:4226
+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
++#: g10/keyedit.c:4243
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
+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
++#: g10/keyedit.c:4283
+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
++#: g10/keyedit.c:4305
+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
++#: g10/keyedit.c:4323
+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
++#: g10/keyedit.c:4329
+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
++#: g10/keyedit.c:4397
+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
++#: g10/keyedit.c:4402
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
+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
++#: g10/keyedit.c:4640
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
+#, 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
++#: g10/keyedit.c:4763
+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
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
+#, 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
++#: g10/keyedit.c:4975
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
+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
++#: g10/keyedit.c:5055
+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
++#: g10/keyedit.c:5115
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
+#, 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
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
+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
++#: g10/keyedit.c:5677
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
+#, 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
++#: g10/keyedit.c:5766
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
+#, 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
++#: g10/keyedit.c:5912
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
+#, 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
++#: g10/keyedit.c:6025
+msgid "Cannot revoke the last valid user ID.\n"
+msgstr "Cannot revoke the last valid user ID.\n"
+
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
+#, 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:168
++#, c-format
++msgid "invalid value for option '%s'\n"
++msgstr "invalid value for option ‘%s’\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
+#, 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
++#: g10/keygen.c:4823
+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
++#: g10/keygen.c:4969 g10/keygen.c:5155
+#, 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
++#: g10/keygen.c:4971 g10/keygen.c:5157
+#, 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
++#: g10/keygen.c:4982 g10/keygen.c:5168
+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
++#: g10/keygen.c:4994 g10/keygen.c:4996
+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
++#: g10/keygen.c:5003 g10/keygen.c:5005
+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
++#: g10/keygen.c:5024 g10/keygen.c:5182
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:330
++#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:332
++#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:372
++#: g10/keylist.c:373
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:425
++#: g10/keylist.c:426
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:427
++#: g10/keylist.c:428
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:473
++#: g10/keylist.c:474
+#, 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
++#: g10/keylist.c:478
++#, 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/keylist.c:482
++#, 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/keylist.c:487
+#, 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
++#: g10/keylist.c:569
+#, 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
++#: g10/keylist.c:591
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
+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
++#: g10/keylist.c:1815
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
+#: g10/keyring.c:1467
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘%s’\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 keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
+#: 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: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: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
++#: g10/keyserver.c:1709
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “%s”: %s\n"
+
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘%s’\n"
+
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
+#, 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
++#: g10/mainproc.c:303
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
+#, 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
++#: g10/mainproc.c:494 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “%s”\n"
+
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
+#, 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
++#: g10/mainproc.c:659 g10/mainproc.c:673
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “for-your-eyes-only”\n"
+
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
+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
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
+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
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
+#, 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
++#: g10/mainproc.c:1808
+#, c-format
+msgid " issuer \"%s\"\n"
+msgstr " issuer “%s”\n"
+
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
++#, c-format
++msgid "WARNING: This key is not suitable for signing in %s mode\n"
++msgstr "WARNING: This key is not suitable for signing in %s mode\n"
++
++#: g10/mainproc.c:2194
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
+#, 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
++#: g10/mainproc.c:2287
+#, 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
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
+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
++#: g10/mainproc.c:2442
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
+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:1147
++#: g10/misc.c:1059
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
- #: g10/misc.c:1151
++#: g10/misc.c:1063
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s” is a deprecated option\n"
+
- #: g10/misc.c:1153
++#: g10/misc.c:1065
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
- #: g10/misc.c:1160
++#: g10/misc.c:1072
+#, 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:1170
++#: g10/misc.c:1082
+#, 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:1174
++#: g10/misc.c:1086
+#, 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:1238
++#: g10/misc.c:1150
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1388
++#: g10/misc.c:1282
+#, 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:1563
++#: g10/misc.c:1457
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
- #: g10/misc.c:1588
++#: g10/misc.c:1482
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘%s’\n"
+
- #: g10/misc.c:1826
++#: g10/misc.c:1720
+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:1848
++#: g10/misc.c:1742
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘%s’\n"
+
+#: g10/openfile.c:78
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘%s’ exists. "
+
+#: g10/openfile.c:82
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:117
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:212
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:360
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘%s’\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:1187
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: 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
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
++#, c-format
++msgid "Note: key %s is not suitable for encryption in %s mode\n"
++msgstr "Note: key %s is not suitable for encryption in %s mode\n"
++
++#: g10/pubkey-enc.c:128
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
+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
++#: g10/pubkey-enc.c:332
+#, 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
++#: g10/pubkey-enc.c:376
+#, 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
++#: g10/pubkey-enc.c:409
+#, 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
++#: g10/pubkey-enc.c:416
+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
++#: g10/seskey.c:62 sm/encrypt.c:124
+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
++#: g10/sig-check.c:153
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
++#, c-format
++msgid "key %s may not be used for signing in %s mode\n"
++msgstr "key %s may not be used for signing in %s mode\n"
++
++#: g10/sig-check.c:191
+#, 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
++#: g10/sig-check.c:193
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
+#, 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
++#: g10/sig-check.c:324
+#, 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
++#: g10/sig-check.c:333
+#, 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
++#: g10/sig-check.c:347 g10/sign.c:267
+#, 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
++#: g10/sig-check.c:356
+#, 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
++#: g10/sig-check.c:373
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
+#, 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
++#: g10/sig-check.c:518
+#, 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
++#: g10/sig-check.c:1109
+#, 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
++#: g10/sig-check.c:1112
+#, 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
++#: g10/sign.c:89
+#, 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
++#: g10/sign.c:115
+#, 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
++#: g10/sign.c:138
+#, 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
++#: g10/sign.c:363
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
+
- #: g10/sign.c:890
++#: g10/sign.c:922
+#, 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
++#: g10/sign.c:1053
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1298
++#: g10/sign.c:1330
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
+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:213
++#: g10/skclist.c:205
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
- #: g10/skclist.c:232
++#: g10/skclist.c:224
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:251
++#: g10/skclist.c:243
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: 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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
+#, 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
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
+#, 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
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
+#, 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
++#: g10/tofu.c:354 g10/tofu.c:887
+#, 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
++#: g10/tofu.c:504
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
- #: g10/tofu.c:538
++#: g10/tofu.c:537
+#, 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
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
+msgid "TOFU DB error"
+msgstr "TOFU DB error"
+
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
+#, 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
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
+#, c-format
+msgid "error initializing TOFU database: %s\n"
+msgstr "error initializing TOFU database: %s\n"
+
- #: g10/tofu.c:844
++#: g10/tofu.c:843
+#, c-format
+msgid "error creating 'encryptions' TOFU table: %s\n"
+msgstr "error creating ‘encryptions’ TOFU table: %s\n"
+
- #: g10/tofu.c:874
++#: g10/tofu.c:873
+#, 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
++#: g10/tofu.c:955
+#, 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:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
+#, 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
++#: g10/tofu.c:1336
+#, 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
++#: g10/tofu.c:1342
+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
++#: g10/tofu.c:1348
+#, 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:1609
++#: g10/tofu.c:1608
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
+msgid "This key's user IDs:\n"
+msgstr "This key's user IDs:\n"
+
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
+#, 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:1748
++#: g10/tofu.c:1747
+#, 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:1798
++#: g10/tofu.c:1797
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
+#, c-format
+msgid "Verified %d message."
+msgid_plural "Verified %d messages."
+msgstr[0] "Verified %d message."
+msgstr[1] "Verified %d messages."
+
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
+#, c-format
+msgid "Encrypted %d message."
+msgid_plural "Encrypted %d messages."
+msgstr[0] "Encrypted %d message."
+msgstr[1] "Encrypted %d messages."
+
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
+#, 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:1839
++#: g10/tofu.c:1838
+#, 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:1853
++#: g10/tofu.c:1852
+#, 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:1859
++#: g10/tofu.c:1858
+#, 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:1869
++#: g10/tofu.c:1868
+#, 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:1875
++#: g10/tofu.c:1874
+#, 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:1885
++#: g10/tofu.c:1884
+#, 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:1891
++#: g10/tofu.c:1890
+#, 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:1899
++#: g10/tofu.c:1898
+#, c-format
+msgid "Messages verified in the past: %d."
+msgstr "Messages verified in the past: %d."
+
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
+#, 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:1920
++#: g10/tofu.c:1919
+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:1962
++#: g10/tofu.c:1961
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
+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:1976
++#: g10/tofu.c:1975
+msgid "Defaulting to unknown.\n"
+msgstr "Defaulting to unknown.\n"
+
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
+msgid "TOFU db corruption detected.\n"
+msgstr "TOFU db corruption detected.\n"
+
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
+#, c-format
+msgid "resetting keydb: %s\n"
+msgstr "resetting keydb: %s\n"
+
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
+#, 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:2827
++#: g10/tofu.c:2826
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
+#, c-format
+msgid "%lld~year"
+msgid_plural "%lld~years"
+msgstr[0] "%lld~year"
+msgstr[1] "%lld~years"
+
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
+#, c-format
+msgid "%lld~month"
+msgid_plural "%lld~months"
+msgstr[0] "%lld~month"
+msgstr[1] "%lld~months"
+
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
+#, c-format
+msgid "%lld~week"
+msgid_plural "%lld~weeks"
+msgstr[0] "%lld~week"
+msgstr[1] "%lld~weeks"
+
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
+#, c-format
+msgid "%lld~day"
+msgid_plural "%lld~days"
+msgstr[0] "%lld~day"
+msgstr[1] "%lld~days"
+
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
+#, c-format
+msgid "%lld~hour"
+msgid_plural "%lld~hours"
+msgstr[0] "%lld~hour"
+msgstr[1] "%lld~hours"
+
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
+#, c-format
+msgid "%lld~minute"
+msgid_plural "%lld~minutes"
+msgstr[0] "%lld~minute"
+msgstr[1] "%lld~minutes"
+
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
+#, c-format
+msgid "%lld~second"
+msgid_plural "%lld~seconds"
+msgstr[0] "%lld~second"
+msgstr[1] "%lld~seconds"
+
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
+#, c-format
+msgid "%s: Verified 0~signatures and encrypted 0~messages."
+msgstr "%s: Verified 0~signatures and encrypted 0~messages."
+
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
+#, c-format
+msgid "%s: Verified 0 signatures."
+msgstr "%s: Verified 0 signatures."
+
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
+#, 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:3168
++#: g10/tofu.c:3166
+msgid "Encrypted 0 messages."
+msgstr "Encrypted 0 messages."
+
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
+#, 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:3187
++#: g10/tofu.c:3185
+#, c-format
+msgid "(policy: %s)"
+msgstr "(policy: %s)"
+
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
+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:3224
++#: g10/tofu.c:3222
+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:3228
++#: g10/tofu.c:3226
+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:3231
++#: g10/tofu.c:3229
+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:3260
++#: g10/tofu.c:3258
+#, 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: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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
+#, 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:3917
++#: g10/tofu.c:3915
+#, 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
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
+#, 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
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
+#, 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 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
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 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
++#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
+#, 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
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
+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
++#: scd/app-openpgp.c:1469
+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
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
+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
++#: scd/app-openpgp.c:1669
+#, 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
++#: scd/app-openpgp.c:2008
+#, c-format
+msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+msgstr "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
+#, 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
++#: scd/app-openpgp.c:2037
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
+#, 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
++#: scd/app-openpgp.c:2113
+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
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
+#, 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
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
+#, 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
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
+#, 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
++#: scd/app-openpgp.c:2260
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
+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
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
+#, 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
++#: scd/app-openpgp.c:2668
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
+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
++#: scd/app-openpgp.c:2741
+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
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
+#, 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
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
+#, 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
++#: scd/app-openpgp.c:4023
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
+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
++#: scd/app-openpgp.c:4189
+#, 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
++#: scd/app-openpgp.c:4274
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
+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
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
+#, 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
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
+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
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
+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
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
+#, 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
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
+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
++#: sm/certcheck.c:244 sm/verify.c:210
+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
++#: sm/certlist.c:132 sm/keylist.c:275 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
++#: sm/decrypt.c:341
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
+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
++#: sm/encrypt.c:330
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
+msgid "list external keys"
+msgstr "list external keys"
+
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
+msgid "import certificates"
+msgstr "import certificates"
+
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
+msgid "export certificates"
+msgstr "export certificates"
+
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
+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
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
+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
++#: sm/gpgsm.c:767
+#, 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
++#: sm/gpgsm.c:778
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘%s’\n"
+
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 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
++#: sm/gpgsm.c:848 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
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘%s’\n"
+
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
+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
++#: sm/keylist.c:670
+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
++#: sm/qualified.c:215 sm/verify.c:653
+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
++#: sm/sign.c:465
+#, 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
++#: sm/sign.c:508
+#, 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
++#: sm/sign.c:560
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
- #: sm/verify.c:457
++#: sm/verify.c:486
+msgid "Signature made "
+msgstr "Signature made "
+
- #: sm/verify.c:461
++#: sm/verify.c:490
+msgid "[date not given]"
+msgstr "[date not given]"
+
- #: sm/verify.c:462
++#: sm/verify.c:491
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
- #: sm/verify.c:481
++#: sm/verify.c:510
+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
++#: sm/verify.c:631
+msgid "Good signature from"
+msgstr "Good signature from"
+
- #: sm/verify.c:603
++#: sm/verify.c:632
+msgid " aka"
+msgstr " aka"
+
- #: sm/verify.c:621
++#: sm/verify.c:650
+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: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
++#: dirmngr/dirmngr.c:166
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
+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
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
+msgid "allow online software version check"
+msgstr "allow online software version check"
+
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
+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
++#: dirmngr/dirmngr.c:213 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
++#: dirmngr/dirmngr.c:216
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
+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
++#: dirmngr/dirmngr.c:229
+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
++#: dirmngr/dirmngr.c:231
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
+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
++#: dirmngr/dirmngr.c:392
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
+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
++#: dirmngr/dirmngr.c:474
+#, 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
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
+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
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
+#, 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
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
+#, 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
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
+#, 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
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
+#, 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
++#: dirmngr/dirmngr.c:1838
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
+#, 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/http.c:1901 dirmngr/ocsp.c:242
++#, c-format
++msgid "error accessing '%s': http status %u\n"
++msgstr "error accessing '%s': http status %u\n"
++
++#: 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"
++
+#: 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
++#: dirmngr/ldap.c:618
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
+
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
+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
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
+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
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
+#, 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
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
+#, 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
++#: dirmngr/server.c:2663
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
+#, 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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
+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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
+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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
+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
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
+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
++#: tools/gpgconf-comp.c:544
+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
++#: tools/gpgconf-comp.c:568
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
+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
++#: tools/gpgconf-comp.c:579
+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
++#: tools/gpgconf-comp.c:583
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
+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
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
+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
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
+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
++#: tools/gpgconf-comp.c:807
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
+msgid "Private Keys"
+msgstr "Private Keys"
+
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
+msgid "Smartcards"
+msgstr "Smartcards"
+
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
+msgid "S/MIME"
+msgstr "S/MIME"
+
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
+msgid "Network"
+msgstr "Network"
+
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
+msgid "Passphrase Entry"
+msgstr "Passphrase Entry"
+
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
+#, c-format
+msgid "error closing '%s'\n"
+msgstr "error closing ‘%s’\n"
+
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
+#, 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
++#: tools/gpgconf.c:128
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
+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
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
+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 66c4d16,c52dbad..0de3730
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -17,7 -16,6 +17,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@@ -28,41 -26,32 +28,41 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to create a sign and encrypt key? "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Ĉu vi vere volas krei subskriban kaj ĉifran ŝlosilon? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nevalida pasfrazo
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -80,75 -68,59 +80,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "malbona pasfrazo"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "pasfrazo estas tro longa\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "pasfrazo estas tro longa\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Nevalida signo en nomo\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "malbona MPI"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "malbona pasfrazo"
@@@ -158,153 -129,112 +158,153 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "neniu skribebla sekreta ŝlosilaro trovita: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "ŝanĝi la pasfrazon"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
#, fuzzy
msgid "Admin PIN"
msgstr "Donu la uzantidentigilon: "
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ripetu pasfrazon: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Ripetu pasfrazon: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ripetu pasfrazon: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -383,8 -300,6 +383,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "ŝanĝi la pasfrazon"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -394,124 -309,95 +394,128 @@@ msgstr "
"Opcioj:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Ŝlosilo estas anstataŭigita."
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detala eligo"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualigi la fido-datenaron"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ne realigita"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -520,177 -406,134 +524,182 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "elektita kompendi-metodo ne validas\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Valida atestilrevoko"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu ŝlosiloj ignoritaj\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -698,9 -541,6 +707,9 @@@ msgstr "
"@Komandoj:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -754,8 -586,6 +763,8 @@@ msgstr "nuligita de uzanto\n
msgid "error while asking for the passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -814,8 -635,6 +823,8 @@@ msgstr "
msgid "Yes"
msgstr "jes"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -866,19 -678,16 +875,19 @@@ msgstr "ŝanĝi la pasfrazon
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "ŝalti ŝlosilon"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -898,7 -704,6 +907,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
@@@ -939,8 -734,6 +948,8 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "error creating a stream for a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -1069,7 -836,6 +1078,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
@@@ -1084,7 -848,6 +1093,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1201,8 -941,6 +1210,8 @@@ msgstr "%s: ŝlosilaro kreita\n
msgid "algorithm: %s"
msgstr "kiraso: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1396,7 -1096,6 +1405,7 @@@ msgstr "nevalida kiraso
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "nevalida kiraso"
@@@ -1421,7 -1116,6 +1430,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "ne traktita"
@@@ -1480,8 -1163,6 +1489,8 @@@ msgstr "publika ŝlosilo %08lX ne trovi
msgid "waiting for lock %s...\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1613,7 -1268,6 +1622,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTO: nevalida notacia dateno trovita\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, fuzzy, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
@@@ -1622,35 -1275,32 +1631,41 @@@
msgid "Enter passphrase: "
msgstr "Donu pasfrazon: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s ne havas sencon kun %s!\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "sekreta ŝlosilo ne havebla"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga reĝimo\n"
@@@ -1660,15 -1309,10 +1675,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Via elekto? "
@@@ -1730,154 -1361,107 +1745,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "skribas publikan ŝlosilon al '%s'\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "aktualigitaj preferoj"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "nevalida signo en signoĉeno\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "nevalida signo en signoĉeno\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "Fingrospuro:"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita ĝis %u bitoj\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1885,179 -1469,135 +1885,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (nur ĉifri)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Nevalida elekto.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Kialo por revoko: "
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Ĉu vere subskribi? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "forlasi ĉi tiun menuon"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "montri ĉi tiun helpon"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Nenia helpo disponata"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "ŝanĝi la daton de eksvalidiĝo"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "ŝanĝi la posedantofidon"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "montri fingrospuron"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "krei novan ŝlosilparon"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eraro dum legado de ŝlosilbloko: %s\n"
@@@ -2118,83 -1646,76 +2118,94 @@@ msgstr "estas sekreta ŝlosilo por la p
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "uzu la opcion \"--delete-secret-key\" por forviŝi ĝin unue.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "'%s' jam densigita\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "legas el '%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, fuzzy, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s-ĉifrita por: %s\n"
- #: g10/encrypt.c:934 g10/pkclist.c:1029 g10/pkclist.c:1080
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
#, fuzzy, c-format
- msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s-ĉifritaj datenoj\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "ĉifrita per nekonata metodo %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVERTO: mesaĝo estis ĉifrita per malforta ŝlosilo en la simetria ĉifro.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problemo ĉe traktado de ĉifrita paketo\n"
@@@ -2278,40 -1782,31 +2289,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorita: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "skribas al '%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ŝlosilo %08lX: PGP-2.x-stila ŝlosilo - ignorita\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2381,234 -1863,186 +2392,239 @@@ msgstr "|NOMO|uzi NOMOn kiel la implici
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "nevalida kiraso"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "ĉifri datenojn"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "ĉifri nur kun simetria ĉifro"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "malĉifri datenojn (implicita elekto)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "kontroli subskribon"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "listigi ŝlosilojn"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "listigi ŝlosilojn kaj subskribojn"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "kontroli ŝlosilsubskribojn"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "listigi sekretajn ŝlosilojn"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "forigi ŝlosilojn de la sekreta ŝlosilaro"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "subskribi ŝlosilon"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "subskribi ŝlosilon loke"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "subskribi ŝlosilon"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "subskribi ŝlosilon loke"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "subskribi aŭ redakti ŝlosilon"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "ŝanĝi la pasfrazon"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "eksporti ŝlosilojn"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "eksporti ŝlosilojn al ŝlosilservilo"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importi ŝlosilojn de ŝlosilservilo"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "aktualigi ĉiujn ŝlosilojn de ŝlosilservilo"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importi/kunfandi ŝlosilojn"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMO|ĉifri por NOMO"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "uzi tekstan reĝimon"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "fari neniajn ŝanĝojn"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr ""
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2616,7 -2050,6 +2632,7 @@@ msgstr "
"@\n"
"(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2646,13 -2079,11 +2662,13 @@@ msgstr "
" --list-keys [nomoj] montri ŝlosilojn\n"
" --fingerprint [nomoj] montri fingroŝpurojn\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2667,7 -2098,6 +2683,7 @@@ msgstr "
"subskribi, kontroli, ĉifri aŭ malĉifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2675,553 -2105,422 +2691,535 @@@ msgstr "
"\n"
"Realigitaj metodoj:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uzado: gpg [opcioj] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr ""
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
- #: g10/gpg.c:2058 g10/gpg.c:2095
- #, fuzzy, c-format
- msgid "valid values for option '%s':\n"
- msgstr "nevalida kiraso"
-
- #: g10/gpg.c:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2105 g10/keygen.c:168
- #, fuzzy, c-format
- msgid "invalid value for option '%s'\n"
- msgstr "nevalida kiraso"
-
- #: g10/gpg.c:2244
++#: g10/gpg.c:2227
#, fuzzy, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Nevalida retadreso\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida ŝlosilaro"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida ŝlosilaro"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida ŝlosilaro"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita ĉifrad-metodo ne validas\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita ĉifrad-metodo ne validas\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
#, 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:3749
++#: g10/gpg.c:3754
#, 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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3858
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/gpg.c:3863
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/gpg.c: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:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "malĉifrado malsukcesis: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesaĝon ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@@ -3236,7 -2533,6 +3234,7 @@@ msgstr "Ĉu forviŝi ĉi tiun ŝlosilo
msgid "make timestamp conflicts only a warning"
msgstr "malkongruo de tempostampoj"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
@@@ -3265,332 -2556,269 +3263,337 @@@ msgstr "Nenia helpo disponata
msgid "No help available for '%s'"
msgstr "Nenia helpo disponata por '%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "montri fingrospuron"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "neuzebla sekreta ŝlosilo"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "montri fingrospuron"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignoras blokon de speco %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu ŝlosiloj jam traktitaj\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignoritaj novaj ŝlosiloj: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignoritaj novaj ŝlosiloj: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sen uzantidentigilo: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importitaj: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " neŝanĝitaj: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novaj uzantidentigiloj: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novaj subŝlosiloj: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novaj ŝlosilrevokoj: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " sekretaj ŝlosiloj legitaj: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "sekretaj ŝlosiloj importitaj: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "sekretaj ŝlosiloj neŝanĝitaj: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, fuzzy, c-format
msgid " not imported: %lu\n"
msgstr " importitaj: %lu"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " sekretaj ŝlosiloj legitaj: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ŝlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ŝlosilo %08lX: mankas valida uzantidentigilo\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ŝlosilo %08lX: publika ŝlosilo ne trovita: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "ŝlosilo %08lX: nova ŝlosilo - ignorita\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "neniu skribebla ŝlosilaro trovita: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ŝlosilo %08lX: publika ŝlosilo importita\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ŝlosilo %08lX: diferencas de nia kopio\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ŝlosilo %08lX: ne povas trovi originalan ŝlosilblokon: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ŝlosilo %08lX: ne povas legi originalan ŝlosilblokon: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ŝlosilo %08lX: 1 nova uzantidentigilo\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ŝlosilo %08lX: 1 nova subskribo\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ŝlosilo %08lX: 1 nova subŝlosilo\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ŝlosilo %08lX: %d novaj subŝlosiloj\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ŝlosilo %08lX: ne ŝanĝita\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "ŝlosilo %08lX: sekreta ŝlosilo importita\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "ŝlosilo '%s' ne trovita: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ŝlosilo %08lX: sekreta ŝlosilo sen publika ŝlosilo - ignorita\n"
@@@ -3605,138 -2833,111 +3608,138 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"ŝlosilo %08lX: publika ŝlosilo mankas - ne povas apliki revokatestilon\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ŝlosilo %08lX: revokatestilo importita\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ŝlosilo %08lX: mankas uzantidentigilo por subskribo\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ŝlosilo %08lX.%lu: Valida subŝlosilrevoko\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ŝlosilo %08lX: ignoris uzantidentigilon '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "ŝlosilo %08lX: ignoris subŝlosilon\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ŝlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
@@@ -3778,79 -2972,12 +3781,15 @@@ msgstr "eraro dum legado de '%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revoko]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[mem-subskribo]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s-subskribo de: %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Bona subskribo de \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "ignoris '%s': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
- msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
- msgstr[1] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d malbonaj subskriboj\n"
- msgstr[1] "%d malbonaj subskriboj\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Bona subskribo de \""
- msgstr[1] "Bona subskribo de \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3863,69 -2990,54 +3802,69 @@@ msgstr "
"kontrolante fingrospurojn el diversaj fontoj ...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fidas iomete\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi plene fidas\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, fuzzy, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
#, fuzzy
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr ""
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Ĉu vere subskribi? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, fuzzy, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3936,7 -3048,6 +3875,7 @@@ msgstr "
"\n"
"Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
#, fuzzy
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
@@@ -3945,7 -3056,6 +3884,7 @@@
"\n"
"Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3956,12 -3066,10 +3895,12 @@@ msgstr "
"\n"
"Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
#, fuzzy
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3972,7 -3080,6 +3911,7 @@@ msgstr "
"\n"
"Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
#, fuzzy
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
@@@ -3981,41 -3088,33 +3920,41 @@@
"\n"
"Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝis!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
#, fuzzy
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4024,32 -3123,26 +3963,32 @@@ msgstr "
"Kiom zorge vi kontrolis, ke la ŝlosilo, kiun vi subskribos, vere apartenas\n"
"al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Mi ne respondas.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Mi tute ne kontrolis.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Mi malzorge kontrolis.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Mi tre zorge kontrolis.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = bonvolu montri pli da informoj\n"
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4058,264 -3151,210 +3997,264 @@@ msgstr "
"Ĉu vi estas tute certa, ke vi volas subskribi ĉi tiun ŝlosilon\n"
"per via ŝlosilo: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Mi tute ne kontrolis ĉi tiun ŝlosilon.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Mi malzorge kontrolis ĉi tiun ŝlosilon.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Mi tre zorge kontrolis ĉi tiun ŝlosilon.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Ĉu vere subskribi? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "skribi kaj fini"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "montri fingrospuron"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "revoki subskribojn"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "subskribi la ŝlosilon loke"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "aldoni foto-identigilon"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "forviŝi uzantidentigilon"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "al"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "forviŝi flankan ŝlosilon"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
#, fuzzy
msgid "add a revocation key"
msgstr "aldoni flankan ŝlosilon"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marku uzantidentigilon kiel ĉefan"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "listigi preferojn (spertula)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "listigi preferojn (detale)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "ŝanĝi la pasfrazon"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "ŝanĝi la posedantofidon"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoki flankan ŝlosilon"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "ŝalti ŝlosilon"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "malŝalti ŝlosilon"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "montri foto-identigilon"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Sekreta ŝlosilo estas havebla.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Bezonas la sekretan ŝlosilon por fari tion.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4323,330 -3362,267 +4262,340 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
#, fuzzy
msgid "Key is revoked."
msgstr "Ŝlosilo estas revokita.\n"
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "nekonata klaso de subskribo"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Vi devas elekti almenaŭ unu uzantidentigilon.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Vi ne povas forviŝi la lastan uzantidentigilon!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Ĉu vi vere volas forviŝi ĉi tiun ŝlosilon? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Ĉu vi vere volas revoki la elektitajn ŝlosilojn? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "agordi liston de preferoj"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Ĉu vere aktualigi la preferojn? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Ĉu skribi ŝanĝojn? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Ĉu fini sen skribi ŝanĝojn? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Ŝlosilo ne ŝanĝita, do aktualigo ne necesas.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Vi ne povas forviŝi la lastan uzantidentigilon!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "nevalida valoro\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "%s: nevalida dosiero-versio %d\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr ""
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr ""
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notacio: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Ĉi tiu ŝlosilo estas revokebla per %s ŝlosilo %s%s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Ĉi tiu ŝlosilo estas revokebla per %s ŝlosilo %s%s\n"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (sentema)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "ne povas krei %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "rev"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [eksvalidiĝos: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [eksvalidiĝos: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Ĉi tiu ŝlosilo estas malŝaltita"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "eksval"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4655,36 -3631,28 +4604,36 @@@ msgstr "
"AVERTO: Ĉi tiu estas PGP2-stila ŝlosilo. Aldono de foto-identigilo eble\n"
" kaŭzos, ke iuj versioj de PGP malakceptos la ŝlosilon.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
#, fuzzy
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni ĝin? (j/n) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Ĉu forviŝi ĉi tiun bonan subskribon? (j/N/f)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Ĉu forviŝi ĉi tiun nevalidan subskribon? (j/N/f)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Ĉu forviŝi ĉi tiun nekonatan subskribon? (j/N/f)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Ĉu vere forviŝi ĉi tiun mem-subskribon? (j/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4692,37 -3660,30 +4641,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Forviŝis %d subskribon.\n"
msgstr[1] "Forviŝis %d subskribon.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nenio estis forviŝita.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "nevalida"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
#, fuzzy
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
@@@ -4732,221 -3693,180 +4681,226 @@@ msgstr "
"AVERTO: Ĉi tiu estas PGP2-stila ŝlosilo. Aldono de foto-identigilo eble\n"
" kaŭzos, ke iuj versioj de PGP malakceptos la ŝlosilon.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
#, fuzzy
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Donu la ŝlosilgrandon"
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Ŝanĝas la daton de eksvalidiĝo de flanka ŝlosilo.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Ŝanĝas la daton de eksvalidiĝo de la ĉefa ŝlosilo.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ĉu surskribi (j/N)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "uzantidentigilo: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " subskribita per %08lX je %s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr ""
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
#, fuzzy
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni ĝin? (j/n) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " subskribita per %08lX je %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr "subskribi ŝlosilon nerevokeble"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokita de %08lX je %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "mankas sekreta ŝlosilo\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Vi ne povas forviŝi la lastan uzantidentigilon!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "nevalida kiraso"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "prefero %c%lu ripetita\n"
@@@ -5392,8 -4235,6 +5346,8 @@@ msgstr "
"kreado de la primoj; tio donas al la stokastilo pli bonan ŝancon\n"
"akiri sufiĉe da entropio.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
@@@ -5465,7 -4293,6 +5419,7 @@@ msgstr "eraro dum skribado de publika �
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta ŝlosiloj kreitaj kaj subskribitaj.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5474,7 -4301,6 +5428,7 @@@ msgstr "
"Notu, ke ĉi tiu ŝlosilo ne estas uzebla por ĉifrado. Vi eble volos\n"
"uzi la komandon \"--edit-key\" por krei flankan ŝlosilon por tiu celo.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5482,7 -4308,6 +5436,7 @@@ msgstr "
"ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
"horloĝeraro)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5490,53 -4315,42 +5444,53 @@@ msgstr "
"ŝlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
"horloĝeraro)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTO: krei subŝlosilojn por v3-ŝlosiloj ne estas OpenPGP-kongrue\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ĉu vere krei? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr ""
- #: g10/keylist.c:330
++#: g10/keylist.c:331
#, fuzzy
msgid "Critical signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
#, fuzzy
msgid "Critical signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5544,7 -4358,20 +5498,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d malbonaj subskriboj\n"
msgstr[1] "%d malbonaj subskriboj\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d malbonaj subskriboj\n"
+ msgstr[1] "%d malbonaj subskriboj\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
+ msgstr[1] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5552,45 -4379,37 +5522,45 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 subskribo ne kontrolita pro eraro\n"
msgstr[1] "1 subskribo ne kontrolita pro eraro\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Ŝlosilaro"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Ŝlosilo-fingrospuro ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " Ŝlosilo-fingrospuro ="
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Ŝlosilo-fingrospuro ="
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Ŝlosilo-fingrospuro ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5701,267 -4499,218 +5671,273 @@@ msgstr "ŝlosilo '%s' ne trovita: %s\n
msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu ŝlosilservilo konata (uzu la opcion --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "nevalida ŝlosilaro"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"subskribita per via ŝlosilo %08lX je %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr ""
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, fuzzy, c-format
msgid "%s encrypted session key\n"
msgstr "%s-ĉifritaj datenoj\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "ĉifrita per nekonata metodo %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "publika ŝlosilo estas %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "publikŝlosile ĉifritaj datenoj: bona DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "ĉifrita per %u-bita %s-ŝlosilo, %08lX, kreita je %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alinome \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "ĉifrita per %s-ŝlosilo, %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "publikŝlosila malĉifrado malsukcesis: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, fuzzy, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Ripetu pasfrazon\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
#, fuzzy
msgid "encrypted with 1 passphrase\n"
msgstr "Ripetu pasfrazon\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "supozas %s ĉifritajn datenojn\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Ĉifro IDEA ne disponata, optimisme provas uzi %s anstataŭe\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
#, fuzzy
msgid "WARNING: message was not integrity protected\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "malĉifrado sukcesis\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTO: ĉifrita mesaĝo estis manipulita!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "malĉifrado malsukcesis: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "originala dosiernomo='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "memstara revoko - uzu \"gpg --import\" por apliki ĝin\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "MALBONA subskribo de \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Eksvalidiĝinta subskribo de \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas malŝaltita\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alinome \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Subskribo farita je %.*s per %s, ŝlosilo %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " alinome \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
#, fuzzy
msgid "Key available at: "
msgstr "Nenia helpo disponata"
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[malcerta]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alinome \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun fidata subskribo!\n"
+
++#: g10/mainproc.c:2194
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
#, fuzzy
msgid "binary"
msgstr "ĉefa"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
#, fuzzy
msgid "unknown"
msgstr "nekonata versio"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nekonata publikŝlosila metodo"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "ne aparta subskribo\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
@@@ -6019,68 -4757,55 +5995,68 @@@ msgstr "kiraso: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
#, fuzzy
msgid "Uncompressed"
msgstr "ne traktita"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "ne traktita"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "legas opciojn el '%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "nekonata klaso de subskribo"
@@@ -6593,35 -5219,32 +6569,40 @@@ msgstr "ne povas malfermi subskribitan
msgid "can't open signed data fd=%d: %s\n"
msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "nenomita ricevonto; provas per sekreta ŝlosilo %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "bone; ni estas la nenomita ricevonto.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "malnova kodado de DEK ne estas realigita\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "ĉifrad-metodo %d%s estas nekonata aŭ malŝaltita\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
msgid "Note: key has been revoked"
msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
@@@ -6778,7 -5373,6 +6759,7 @@@ msgstr "
msgid "Is this okay? (y/N) "
msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "malforta ŝlosilo kreita - provas denove\n"
@@@ -6798,40 -5389,37 +6779,45 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr ""
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = bonvolu montri pli da informoj\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
msgstr[1] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
msgstr[1] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6844,7 -5432,6 +6830,7 @@@ msgstr[1] "
"ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
"horloĝeraro)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6856,39 -5443,32 +6842,39 @@@ msgstr[1] "
"ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
"horloĝeraro)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTO: subskribo-ŝlosilo %08lX eksvalidiĝis je %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, fuzzy, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6896,7 -5476,6 +6882,7 @@@ msgstr "
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6905,42 -5484,34 +6891,42 @@@ msgstr "
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "subskribas:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ĉifrado estos aplikata\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignoris '%s': ripetita\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7027,7 -5582,6 +7013,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
@@@ -7138,217 -5670,178 +7124,217 @@@ msgstr "ne povas trakti tekstliniojn pl
msgid "input line longer than %d characters\n"
msgstr "enigata linio pli longa ol %d signojn\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Realigitaj metodoj:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Gvidlinio: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listigi ŝlosilojn"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, 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:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
@@@ -7356,148 -5849,122 +7342,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Forviŝis %d subskribojn.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
msgid "Encrypted 0 messages."
msgstr "Ripetu pasfrazon\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Gvidlinio: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7514,18 -5981,14 +7500,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7759,19 -6177,14 +7745,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7820,44 -6224,35 +7806,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
@@@ -7865,54 -6260,43 +7851,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "ŝanĝi la pasfrazon"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7922,26 -6306,21 +7908,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "ŝanĝi la pasfrazon"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "ŝanĝi la pasfrazon"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Kialo por revoko: "
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7949,117 -6328,93 +7935,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "ŝanĝi la pasfrazon"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "ŝanĝi la pasfrazon"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "eraro dum legado de ŝlosilbloko: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "'%s' jam densigita\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "krei novan ŝlosilparon"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "krei novan ŝlosilparon"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "nerealigita URI"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Kreado de ŝlosiloj malsukcesis: %s\n"
msgstr[1] "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@@ -8081,11 -6433,9 +8067,11 @@@ msgstr "Donu la uzantidentigilon:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
@@@ -8141,12 -6480,10 +8127,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8221,9 -6543,6 +8207,9 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@@ -8422,7 -6701,6 +8408,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8466,7 -6737,6 +8452,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
@@@ -8731,11 -6948,9 +8717,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8764,139 -6974,108 +8750,139 @@@ msgstr "ripetita atestilo - forviŝita
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "nevalida respondo de agento\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "listigi sekretajn ŝlosilojn"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "Valida atestilrevoko"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "Bona atestilo"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "Bona atestilo"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "krei eligon en askia kiraso"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "tute ne uzi la terminalon"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "neinteraga reĝimo: neniam demandi"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "aldoni ĉi tiun ŝlosilaron al la listo de ŝlosilaroj"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi ĉi tiun ŝlosilservilon por serĉi ŝlosilojn"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMO|uzi kompendi-metodon NOMO"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8907,47 -7086,38 +8893,47 @@@ msgstr "
"subskribi, kontroli, ĉifri aŭ malĉifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "ne povas konektiĝi al '%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = supersalti ĉi tiun ŝlosilon\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "skribas al '%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9010,7 -7168,6 +8996,7 @@@ msgstr "rev? problemo en kontrolo de re
msgid "error storing flags: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9039,7 -7192,6 +9025,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9053,51 -7204,41 +9039,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Bona subskribo de \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " alinome \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
@@@ -9894,116 -7874,88 +9880,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Ĉu fini sen skribi ŝanĝojn? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10016,91 -7968,72 +10002,91 @@@ msgstr "
"@\n"
"(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uzado: gpg [opcioj] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s ne eblas kun %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "pasfrazo estas tro longa\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kiraso: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "ne traktita"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10278,7 -8175,14 +10264,18 @@@ msgstr "%s: ne estas fido-datenaro\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "eraro dum legado de '%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
@@@ -10343,12 -8235,10 +10340,12 @@@ msgstr "serĉas pri \"%s\" ĉe HKP-serv
msgid "malloc failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10412,12 -8290,6 +10409,7 @@@ msgstr "eraro dum skribado de ŝlosilar
msgid "error reading HTTP response for '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "eraro dum legado de '%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@@ -10536,77 -8384,61 +10528,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10743,193 -8546,146 +10735,193 @@@ msgstr "subskribado malsukcesis: %s\n
msgid "error sending standard options: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|uzi pasfraz-reĝimon N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOMO|ĉifri por NOMO"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "reteraro"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "malbona pasfrazo"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "publika ŝlosilo ne trovita"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -11002,27 -8742,22 +10994,27 @@@ msgstr "uzi dosieron por eligo
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "publika ŝlosilo ne trovita"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
diff --cc po/es.po
index 3bfe673,a9eb67b..50010ad
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -19,7 -18,6 +19,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"plural: Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
@@@ -30,47 -28,38 +30,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|entrada de pin-etiqueta|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|entrada de pin-etiqueta|_Cancelar"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
msgstr "|entrada de pin-etiqueta|_OK"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
msgstr "|entrada de pin-etiqueta|_OK"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|entrada de pin-etiqueta|PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
#, fuzzy
#| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
msgstr "|entrada de pin-etiqueta|_Cancelar"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to create a sign and encrypt key? "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "frase contraseña incorrecta
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Calidad:"
@@@ -88,18 -76,15 +88,18 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr "barra de calidad, entrada de pin"
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
"Por favor introduzca su PIN para desbloquear la clave secreta de esta sesión"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -107,7 -92,6 +107,7 @@@ msgstr "
"Por favor introduzca la frase contraseña para desbloquear la clave secreta "
"de esta sesión"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
@@@ -120,45 -104,34 +120,45 @@@
# ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
# ¿Es que son más listos? :-)
#
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Frase contraseña:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "no coincide - reinténtelo"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (intento %d de %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "PIN demasiado largo"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Frase contraseña demasiado larga"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Caracteres inválidos en el PIN"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "PIN demasiado corto"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "PIN incorrecto"
@@@ -171,7 -144,6 +171,7 @@@
# ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
# ¿Es que son más listos? :-)
#
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Frase contraseña errónea"
@@@ -180,43 -151,24 +180,43 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de más de %d bits\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "detectada tarjeta con S/N: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Por favor vuelva a introducir frase contraseña"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, fuzzy, c-format
#| msgid ""
#| "Please enter a passphrase to protect the received secret key%%0A %s"
@@@ -272,64 -216,50 +272,64 @@@ 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:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "fallo al crear un flujo desde el socket: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Por favor inserte la tarjeta con número de serie"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Por favor retire tarjeta actual e inserte la que tiene número de serie"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "PIN del Administrador"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Código de Reinicio"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, fuzzy, c-format
#| msgid "%s%%0A%%0AUse the reader's keypad for input."
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AUse el teclado del lector como entrada."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Repita este Código de Reinicio"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Repita este PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Repita este PIN"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Código de Reinicio repetido incorrectamente; inténtelo de nuevo"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK repetido incorrectamente; inténtelo de nuevo"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
@@@ -432,8 -349,6 +432,8 @@@ msgstr "Por favor introduzca frase cont
msgid "Please enter the new passphrase"
msgstr "Por favor escriba la nueva frase contraseña"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -441,123 -356,94 +441,127 @@@ msgstr "
"@Opciones:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "ejecutar en modo demonio (segundo plano)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "ejecutar en modo servidor (primer plano)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "ejecutar en modo servidor"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "prolijo"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "algo más discreto"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "salida de datos estilo sh"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "salida de datos estilo csh"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "no independizarse de la consola"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "no acaparar teclado y ratón"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "usar un fichero log para el servidor"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|usar PGM como el programa para entrada de PIN"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|usar PCM como programa SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "no usar SCdaemon"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOMBRE|conectar al socket Assuan NOMBRE"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ignorar peticiones de cambiar el TTY"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ignorar peticiones de cambiar el display X"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|los PINs en la caché expiran en N segundos"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "no usar el caché de PINs al firmar"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "no permite reusar antiguas frases contraseña"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "permitir que los clientes marquen claves como \"fiables\""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "permitir preestablecer frase contraseña"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "permitir emulación de ssh-agent"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -566,21 -452,14 +570,21 @@@ msgstr "no disponible
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: 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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -592,158 -471,124 +596,163 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "el algoritmo de resumen seleccionado no inválido\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "no se puede crear el socket: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
msgstr "el nombre de socket `%s' es demasiado largo\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "ya hay un agente gpg ejecutándose - no se inicia otro\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "error obteniendo valor único para el socket\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "error enlazando el socket con `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() falló: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
msgstr "escuchando el socket `%s'\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
msgstr "directorio `%s' creado\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
#| msgid "stat() failed for `%s': %s\n"
msgid "stat() failed for '%s': %s\n"
msgstr "stat() falló para `%s': %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
#| msgid "can't use `%s' as home directory\n"
msgid "can't use '%s' as home directory\n"
msgstr "no puede usar `%s' como directorio personal\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error leyendo valor único en el descriptor %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "manejador 0x%lx para descriptor %d iniciado\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "manejador ssh 0x%lx para el descriptor %d iniciado\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, 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:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Uso: gpg-preset-passphrase [opciones] KEYGRIP (-h para ayuda)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -755,8 -600,6 +764,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:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -764,9 -607,6 +773,9 @@@ msgstr "
"@Órdenes:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -820,8 -652,6 +829,8 @@@ msgstr "cancelado\n
msgid "error while asking for the passphrase: %s\n"
msgstr "error pidiendo la frase contraseña: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -888,8 -709,6 +897,8 @@@ msgstr "
msgid "Yes"
msgstr "Sí"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "No"
@@@ -944,7 -756,6 +953,7 @@@ msgstr "Cambia la frase contraseña
msgid "I'll change it later"
msgstr "La cambiaré más tarde"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -952,13 -763,11 +961,13 @@@
"%%0A?"
msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "habilita clave"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -979,7 -785,6 +988,7 @@@ msgstr "la clave %s usa un hash insegur
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "la comprobación de la firma creada falló: %s\n"
@@@ -1021,8 -816,6 +1030,8 @@@ msgstr "error creando tubería: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "error creando tubería: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "error bifurcando procesos: %s\n"
@@@ -1154,7 -921,6 +1163,7 @@@ msgstr "agotado nucleo de memoria segur
msgid "out of core while allocating %lu bytes"
msgstr "error de memoria reservando %lu bytes"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "error reservando memoria: %s\n"
@@@ -1170,7 -934,6 +1179,7 @@@ msgstr "%s:%u: opción obsoleta \"%s\"
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ATENCIÓN: \"%s\" es una opción obsoleta - no tiene efecto\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1282,8 -1022,6 +1291,8 @@@ msgstr "Creada clave de sesión
msgid "algorithm: %s"
msgstr "algoritmo: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "algoritmo no disponible: %s"
@@@ -1452,7 -1152,6 +1461,7 @@@ msgstr "opción inválida
msgid "missing argument for option \"%.50s\"\n"
msgstr "falta parámetro para la opción \"%.50s\"\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "invalid argument for option \"%.50s\"\n"
@@@ -1478,7 -1173,6 +1487,7 @@@ msgstr "la opción \"%.50s\" es ambigua
msgid "command \"%.50s\" is ambiguous\n"
msgstr "la orden \"%.50s\" es ambigua\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "memoria desbordada\n"
@@@ -1541,8 -1224,6 +1550,8 @@@ msgstr "bloqueo `%s' no hecho: %s\n
msgid "waiting for lock %s...\n"
msgstr "esperando al bloqueo %s...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@@ -1672,7 -1327,6 +1681,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "ATENCIÓN: encontrados datos de notación inválidos\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "fallo al hacer la petición proxy %s al cliente\n"
@@@ -1681,35 -1334,33 +1690,42 @@@
msgid "Enter passphrase: "
msgstr "Introduzca frase contraseña: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "ATENCION: "
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s aún no funciona con %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "tarjeta OpenPGP no disponible: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@@ -1717,14 -1367,9 +1733,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "No hay Código de Reinicio o ya no está disponible\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Su elección: "
@@@ -1781,93 -1413,57 +1797,77 @@@ msgstr "Error: nombre combinado demasia
msgid "URL to retrieve public key: "
msgstr "URL de donde recuperar la clave pública: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Error: URL demasiado larga (el máximo son %d caracteres).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "error leyendo `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "error escribiendo `%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Datos de login (nombre de la cuenta): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Error: el login es demasiado largo (límite de %d caracteres).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Datos privados: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
- "Error: los datos privados son demasiado largos (límite de %d caracteres).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Preferencias de idioma: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Error: longitud de la cadena de preferencias inválida.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Error: caracteres inválidos en cadena de preferencias.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Error: respuesta no válida.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "Huella dactilar CA:"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Error: formato inválido de huella dactilar.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "la operación con la clave no es posible: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "no es una tarjeta OpenPGP"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "error obteniendo la información actual de la clave: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "¿Reemplazar la clave existente? (s/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1882,58 -1478,46 +1882,58 @@@ msgstr "
" requerido. Si la generación de clave fracasa, por favor compruebe\n"
" la documentación de su tarjeta para ver los tamaños posibles.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "¿De qué tamaño quiere la clave de Firmado? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "¿De qué tamaño quiere la clave de Cifrado? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "¿De qué tamaño quiere la clave de Autenticación? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Ahora la tarjeta se reconfigurará para generar una clave de %u bits\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "error cambiando el tamaño de la clave %d a %u bits: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"¿Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "NOTA: ¡claves ya almacenadas en la tarjeta!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "¿Reemplazar las claves existentes? (s/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1948,169 -1532,125 +1948,169 @@@ msgstr "
" PIN = `%s' PIN Administrador = `%s'\n"
"Debería cambiarlos usando la orden --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Por favor seleccione tipo de clave que generar:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Clave de firmado\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Clave de cifrado\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Clave de autentificación\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Elección inválida.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Por favor elija donde guardar la clave:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "lectura fallida: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Esta orden no se permite en modo %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "NOTA: ¡claves ya almacenadas en la tarjeta!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "¿Firmarlo? (s/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "sale de este menú"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "ver órdenes de administrador"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "muestra esta ayuda"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "listar todos los datos disponibles"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "cambiar el nombre del titular de la tarjeta"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "cambiar URL de donde obtener la clave"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "recuperar la clave especificada en la URL de la tarjeta"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "cambiar nombre de usuario"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "cambiar preferencias de idioma"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "cambiar sexo del titular de la tarjeta"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "cambiar huella dactilar de una CA"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "cambiar estado de la opción forzar firma del PIN"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "generar nuevas claves"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "menú para cambiar o desbloquear el PIN"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "verificar PIN y listar todos los datos"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "desbloquear PIN usando Código de Reinicio"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/tarjeta> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Órdenes sólo de administrador\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Se permiten órdenes de administrador\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "No se permiten órdenes de administrador\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Orden inválida (pruebe \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error leyendo bloque de claves: %s\n"
@@@ -2171,39 -1699,32 +2171,39 @@@ msgstr "¡hay una clave secreta para es
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "use antes la opción \"--delete-secret-key\" para borrarla.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creando frase contraseña: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "no puede usar un paquete simétrico ESK debido al modo S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "usando cifrado %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' ya está comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ATENCIÓN `%s' es un fichero vacío\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "leyendo desde `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2211,7 -1732,16 +2211,20 @@@ msgstr "
"AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "no puede usar el cifrado `%s' en modo %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "ATENCIÓN: \"%s\" es una opción obsoleta - no tiene efecto\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2220,40 -1750,34 +2233,41 @@@ msgstr "
"AVISO: forzar el algoritmo de compresión %s (%d) va en contra\n"
"de las preferencias del receptor\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzar el cifrado simétrico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "no puede usar %s en modo %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado con algoritmo desconocido %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problema trabajando con un paquete cifrado\n"
@@@ -2340,39 -1847,30 +2354,39 @@@ msgstr "borrar tanto como sea posible d
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "escribiendo en `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "clave %s: material de la clave en la tarjeta - omitida\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "no se permite exportar claves secretas\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "ATENCIÓN: no se ha exportado nada\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2444,221 -1929,175 +2458,227 @@@ msgstr "|NOMBRE|usa NOMBRE como clave s
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "crea una firma"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "crea una firma en texto claro"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "crea una firma separada"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "cifra datos"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "cifra sólo con un cifrado simétrico"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "lista claves"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "lista claves y firmas"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "lista claves secretas"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocación"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo público"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "cambia una frase contraseña"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exporta claves"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exporta claves a un servidor de claves"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importa claves desde un servidor de claves"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "busca claves en un servidor de claves"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importa/fusiona claves"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "escribir estado de la tarjeta"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "cambiar datos en la tarjeta"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "cambiar el PIN de la tarjeta"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "imprime resúmenes de mensaje"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "ejecutar en modo servidor"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID-USUARIO|cifra para ID-USUARIO"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivel de compresión N (0 desactiva)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "usa modo de texto canónico"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "no hace ningún cambio"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "usar estilo OpenPGP estricto"
@@@ -2666,7 -2105,6 +2686,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:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2674,7 -2112,6 +2694,7 @@@ msgstr "
"@\n"
"(Véase en la página del manual la lista completo de órdenes y opciones)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2704,13 -2141,11 +2724,13 @@@ msgstr "
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2725,7 -2160,6 +2745,7 @@@ msgstr "
"firma, comprueba, cifra o descifra\n"
"la operación por defecto depende de los datos de entrada\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2733,81 -2167,66 +2753,81 @@@ msgstr "
"\n"
"Algoritmos disponibles:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Clave pública: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Cifrado: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Resumen: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Compresión: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "uso: gpgsm [opciones] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "órdenes incompatibles\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2817,20 -2236,17 +2837,20 @@@ msgstr "
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuración `%s'\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2841,445 -2257,335 +2861,426 @@@ msgstr "
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuración `%s'\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, 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:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, 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:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "mostrar URLS de política al listar firmas"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones estándar IETF al listar firmas"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "mostrar URL del servidor de claves preferido al listar firmas"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "mostrar validez de la ID de usuario al listar claves"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "mostrar subclaves revocadas y expiradas al listar claves"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "mostrar nombre de los anillos de claves al listar claves"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "opción desconocida `%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, 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:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inválidas\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inválidas\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importación inválidas\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "opciones de importación inválidas\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "lista de opciones inválida\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportación inválidas\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "opciones de exportación inválidas\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inválida\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "lista de opciones inválida\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de política al verificar firmas"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones estándar IETF al verificar firmas"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del ID de usuario al verificar firmas"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo ID primario de usuario al verificar firmas"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar confianza en las firmas con datos válidos PKA"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificación inválidas\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "opciones de verificación inválidas\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, 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:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localización de claves inválida\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "¡%s no permitido con %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "¡%s no tiene sentido con %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecutándose con hora del sistema falsificada"
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inválido\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresión seleccionado es inválido\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inválidas\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inválidas\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inválidas\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresión inválidas\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s aún no funciona con %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "no puede usar el resumen `%s' en modo %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, 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"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "no puede usar la compresión `%s' en modo %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, 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:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, 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:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "no puede usar --symetric --encrypt en modo %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "envío al servidor de claves fallido: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepción del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "exportación de clave fallida: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "búsqueda del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovación al servidor de claves fallida: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminación de armadura fallida: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creación de armadura fallida: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
@@@ -3287,19 -2593,15 +3288,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:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "URL de política de certificado inválida\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "URL de política inválida\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es válida\n"
@@@ -3311,7 -2611,6 +3312,7 @@@ msgstr "|FICHERO|tomar las claves del a
msgid "make timestamp conflicts only a warning"
msgstr "hacer que los conflictos de fecha-hora sean sólo un aviso"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe información de estado en este descriptor de fichero"
@@@ -3341,144 -2635,120 +3342,150 @@@ msgstr "Ayuda no disponible
msgid "No help available for '%s'"
msgstr "No hay ayuda disponible para `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "importar firmas marcadas como sólo locales"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "reparar daño del servidor de claves públicas al importar"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "no actualiza la base de datos de confianza después de importar"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "no actualiza la base de datos de confianza después de importar"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "muestra huella dactilar de la clave"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "sólo aceptar actualizaciones de claves ya existentes"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "borrar partes inútiles de la clave después de importar"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "borrar tanto como sea posible de la clave tras importar"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "asumir entrada en formato binario"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "muestra huella dactilar de la clave"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "omitiendo bloque de tipo %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu claves procesadas hasta ahora\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Cantidad total procesada: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin identificador: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuevos identificativos: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuevas subclaves: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuevas firmas: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nuevas revocaciones de claves: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claves secretas leídas: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " claves secretas importadas: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claves secretas sin cambios: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " no importadas: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " firmas limpiadas: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " IDs de usuario limpiados: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3487,195 -2757,157 +3494,195 @@@ msgstr "
"AVISO: la clave %s contiene preferencias para algoritmos\n"
"no disponibles en estos IDs de usuario:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": algoritmo de cifrado preferido %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": algoritmo de resumen preferido %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": algoritmo de compresión preferido %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"re-dustribuya esta clave para evitar potenciales problemas de\n"
"diferencias en los algoritmos.\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "clave %s: sin identificador de usuario\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clave %s: reparada la subclave PKS corrompida\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clave %s: sin identificadores de usuario válidos\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "esto puede ser debido a la ausencia de autofirma\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clave %s: clave pública no encontrada: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clave %s: clave nueva - omitida\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "anillo de claves no escribible encontrado: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clave %s: clave pública \"%s\" importada\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clave %s: no coincide con nuestra copia\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clave %s: \"%s\" 1 firma nueva\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clave %s: \"%s\" 1 subclave nueva\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clave %s: \"%s\" sin cambios\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clave %s: clave secreta importada\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "omitido: clave secreta ya presente\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "clave secreta \"%s\" no encontrada: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "no se permite importar claves secretas\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clave %s: clave secreta con cifrado inválido %d - omitida\n"
@@@ -3690,141 -2922,114 +3697,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"clave %s: falta la clave pública - imposible emplear el\n"
"certificado de revocación\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clave %s: certificado de revocación inválido: %s - rechazado\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clave %s: \"%s\" certificado de revocación importado\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clave %s: no hay identificador de usuario para la firma\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "clave %s: algoritmo de clave pública no disponible para ID \"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clave %s: autofirma inválida para el id \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clave %s: algoritmo de clave pública no disponible\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clave %s: firma directa de clave inválida\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clave %s: no hay subclave que unir a la clave\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clave %s: unión de subclave inválida\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clave %s: borrado enlace de subclaves múltiples\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clave %s: no hay subclave para la revocación de clave\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clave %s: revocación de subclave inválida\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clave %s: borrada revocación de subclave múltiple\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clave %s: omitido ID de usuario \"%s\"\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clave %s: subclave omitida\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "clave %s: certificado de revocación en lugar equivocado - omitido\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clave %s: certificado de revocación no valido: %s - omitido\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clave %s: detectado usuario duplicado - fusionada\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: recuperando clave de revocación %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: falta clave de revocación %s.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %s: \"%s\" certificado de revocación añadido\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %s: firma directa de clave añadida\n"
@@@ -3870,86 -3068,12 +3877,15 @@@ msgstr "error abriendo `%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo reconstruyendo caché del anillo de claves: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocación]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autofirma]"
- #: 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"
- msgstr "error reservando memoria: %s\n"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "clave %s: algoritmo de clave pública no disponible\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "revoke signatures"
- msgid " (reordered signatures follow)"
- msgstr "revoca firmas"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
- msgid "key %s:\n"
- msgstr "omitido \"%s\": %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
- msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 firma no comprobada por falta de clave\n"
- msgstr[1] "1 firma no comprobada por falta de clave\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d firmas incorrectas\n"
- msgstr[1] "%d firmas incorrectas\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Firma correcta de"
- msgstr[1] "Firma correcta de"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3961,17 -3085,14 +3897,17 @@@ msgstr "
"pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Confío un poco\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Confío totalmente\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3981,50 -3102,38 +3917,50 @@@ msgstr "
"Un nivel mayor que 1 permite que la clave que está firmando pueda\n"
"hacer firmas de confianza en su nombre.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID de usuario \"%s\" revocado."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "¿Seguro que todavía quiere firmarlo? (s/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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Imposible firmar.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID de usuario \"%s\" expirado."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID de usuario \"%s\" no tiene autofirma."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID de usuario \"%s\" puede firmarse."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "¿Firmarlo? (s/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4033,11 -3142,9 +3969,11 @@@ msgstr "
"La autofirma en \"%s\"\n"
"es una firma de tipo PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4046,11 -3153,9 +3982,11 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"ha expirado.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "¿Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4059,43 -3164,34 +3995,43 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"es una firma local.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ya estaba firmada por la clave %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "¿Quiere firmarlo aún así? (s/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que firmar con la clave %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "¡Esta clave ha caducado!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta clave expirará el %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "¿Quiere que su firma caduque al mismo tiempo? (S/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4105,33 -3201,27 +4041,33 @@@ msgstr "
"firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
"contestar, introduzca \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No contesto.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) No lo he comprobado en absoluto.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He hecho una comprobación informal.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Lo he comprobado meticulosamente.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "¿Su elección? (escriba '?' si desea más información): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4140,223 -3230,169 +4076,223 @@@ msgstr "
"¿Está realmente seguro de querer firmar esta clave\n"
"con su clave: \"%s\" (%s)?\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Esto será una autofirma.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "ATENCION: la firma no se marcará como no exportable.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "AVISO: la firma no se marcará como no revocable.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "La firma se marcará como no exportable.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "La firma se marcará como no revocable.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "No he comprobado esta clave en absoluto.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "He comprobado esta clave informalmente.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "He comprobado esta clave meticulosamente.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "¿Firmar de verdad? (s/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"La clave tiene sólo un apuntador u objetos de clave en la propia tarjeta\n"
"- no hay frase contraseña que cambiar.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "error creando frase contraseña: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "graba y sale"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "muestra huella dactilar de la clave"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Introduzca keygrip: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "lista clave e identificadores de usuario"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "selecciona identificador de usuario N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "selecciona subclave N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "comprueba firmas"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr "firmar IDs seleccionadas [* ver debajo órdenes relacionadas]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "firma localmente los IDs de usuarios elegidos"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "firmar IDs seleccionados con firma de confianza"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "firmar IDs seleccionados con firma no revocable"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "añadir un identificador de usuario"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "añadir un ID fotográfico"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "borrar identificadores de usuario seleccionados"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "añadir una subclave"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "añadir clave a tarjeta"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "mover una clave a la tarjeta"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "mover una clave de respaldo a la tarjeta"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "borrar clave secundaria"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "añadir una clave de revocación"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "borrar firmas de los ID seleccionados"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "marcar ID de usuario seleccionado como primario"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "mostrar preferencias (experto)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "mostrar preferencias (prolijo)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "establecer preferencias para todos los ID seleccionados"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "establecer URL del servidor de claves preferido por los IDs elegidos"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "establecer notación para los IDs de usuario seleccionados"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "cambia la frase contraseña"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "revocar firmas de los identificadores seleccionados"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "revocar los identificadores seleccionados"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "revoca clave o subclaves seleccionadas"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "habilita clave"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "deshabilita clave"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "mostrar fotos de los ID seleccionados"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "compactar IDs inutilizables y borrar firmas inutilizables de la clave"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "compactar IDs inutilizables y borrar todas las firmas de la clave"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4374,288 -3410,236 +4310,300 @@@ msgstr "
"locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
"revocables (nrsign) o cualquier combinación de ellas (ltsign, tnrsign, etc)\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "La clave está revocada."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Clase de firma desconocida `%s'\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Esta orden no se permite en modo %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "¡No puede borrar el último identificador de usuario!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "¿Borrar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "¿Borrar realmente este identificador de usuario? (s/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "¿Realmente cambiar de sitio la clave primaria? (s/N)"
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar exactamente una clave.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "La orden espera un nombre de fichero como argumento\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "No se puede abrir `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "¿De verdad quiere borrar esta clave? (s/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "¿Revocar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "¿Revocar realmente este identificador de usuario? (s/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "¿De verdad quiere revocar la clave completa? (s/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "¿De verdad quiere revocar las subclaves seleccionadas? (s/N)"
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "¿De verdad quiere revocar esta subclave? (s/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"La confianza del propietario no puede establecerse si se está usando\n"
"una base de datos de confianza propocionada por el usuario\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Establecer lista de preferencias a:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"¿Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "¿Actualizar realmente las preferencias? (s/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "¿Grabar cambios? (s/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "¿Salir sin grabar? (s/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "actualización fallida: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualización.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "¡No puede borrar el último identificador de usuario!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "la comprobación de la lista de confianza falló: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "la comprobación de la lista de confianza falló: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "huella dactilar no válida"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "fallo obteniendo huella digital\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valor inválido\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "ID de usuario inexistente.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Nada que firmar con la clave %s\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "`%s' no es una fecha de caducidad válida\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "invalid fingerprint"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "huella dactilar no válida"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "clave \"%s\" no encontrada: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Resumen: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Características: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Sevidor de claves no-modificar"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Servidor de claves preferido: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Notaciones: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "La siguiente clave fue revocada en %s por %s clave %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Esta clave puede ser revocada por %s clave %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(confidencial)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "creado: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "revocada: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "caducó: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "caduca: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "num. tarjeta: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "confianza: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "validez: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Esta clave está deshabilitada"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4663,18 -3647,12 +4611,18 @@@ msgstr "
"Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
"correcta a menos de que reinicie el programa.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "caducada"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4682,17 -3660,14 +4630,17 @@@ msgstr "
"AVISO: ningún ID de usuario está marcado como principal. Esta orden puede\n"
" causar que se tome como principal por defecto otro ID de usuario.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4701,35 -3676,27 +4649,35 @@@ msgstr "
"AVISO: esta es una clave de tipo PGP2. Añadir un ID fotográfico puede\n"
"hacer que algunas versiones de PGP rechacen esta clave.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "¿Está seguro de querer añadirla? (s/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "¿Borrar esta firma correcta? (s/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "¿Borrar esta firma inválida? (s/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "¿Borrar esta firma desconocida? (s/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "¿Borrar realmente esta autofirma? (s/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4737,20 -3704,16 +4685,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d firmas borradas.\n"
msgstr[1] "%d firmas borradas.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "No se borró nada\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "inválida"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID de usuario \"%s\" compactado: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4758,17 -3721,14 +4706,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID de usuario \"%s\": ya minimizado\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID de usuario \"%s\" ya limpiado\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4777,38 -3737,30 +4725,38 @@@ msgstr "
"AVISO: esta es una clave tipo PGP2. Añadir un revocador designado puede\n"
" hacer que algunas versiones de PGP rechacen esta clave.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduzca el ID de usuario del revocador designado: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "no puede elegir una clave como su propio revocador designado\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "esta clave ya ha sido designada como revocadora\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4818,173 -3770,141 +4766,179 @@@ msgid "
msgstr ""
"¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando fecha de caducidad de subclave.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "la subclave de firmado %s ya está certificada en cruz\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "la subclave %s no firma y así no necesita ser certificada en cruz\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Introduzca la URL de su servidor de claves preferido: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "¿Seguro que quiere borrarlo? (s/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Introduzca la notación: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "¿Continuar? (s/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hay ningún identificador de usuario con el índice %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "No hay ID de usuario con hash %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "No existe una subclave con índice %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "No existe una subclave con índice %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "firmada con su clave %s el %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (no exportable)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta firma caducó el %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "¿De verdad quiere revocarla? (s/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "No está firmado por usted.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (no revocable)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocada por la clave %s el %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Va a revocar las siguientes firmas:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "¿Crear los certificados de revocación realmente? (s/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, fuzzy, c-format
#| msgid "revoke a user ID"
msgid "tried to revoke a non-user ID: %s\n"
msgstr "revocar un identificador de usuario"
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "¡No puede borrar el último identificador de usuario!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La subclave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Mostrando ID fotográfico %s de tamaño %ld para la clave %s (uid %d)\n"
++#: g10/keygen.c: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/keygen.c:317
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
@@@ -5428,8 -4271,6 +5382,8 @@@ msgstr "
"generador de números aleatorios mayor oportunidad de recoger suficiente\n"
"entropía.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creación de la clave fallida: %s\n"
@@@ -5506,7 -4334,6 +5460,7 @@@ msgstr "error escribiendo anillo públi
msgid "public and secret key created and signed.\n"
msgstr "claves pública y secreta creadas y firmadas.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5514,7 -4341,6 +5468,7 @@@ msgstr "
"Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
"la orden \"--edit-key\" para crear una subclave con este propósito.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5522,7 -4348,6 +5476,7 @@@ msgstr "
"clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5530,49 -4355,38 +5484,49 @@@ msgstr "
"clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaves para claves V3 no sigue el estándar OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Las partes secretas de la clave primaria no están disponibles.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "¿Crear de verdad? (s/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Política de firmas críticas: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Política de firmas: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Servidor de claves crítico preferido: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Notación de firmas críticas: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Notación de firma: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5580,7 -4394,20 +5534,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d firmas incorrectas\n"
msgstr[1] "%d firmas incorrectas\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d firmas incorrectas\n"
+ msgstr[1] "%d firmas incorrectas\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 firma no comprobada por falta de clave\n"
+ msgstr[1] "1 firma no comprobada por falta de clave\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5588,40 -4415,32 +5558,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 firma no comprobada por causa de un error\n"
msgstr[1] "1 firma no comprobada por causa de un error\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Anillo de claves"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Huellas dactilares de la clave primaria:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Huella clave primaria:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Huella de clave ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Número de serie de la tarjeta ="
@@@ -5732,263 -4530,215 +5702,270 @@@ msgstr "clave no encontrada en el servi
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando clave %s de %s servidor %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando clave %s de %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\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:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "enviando clave %s a %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "solicitando clave %s de %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: imposible recuperar URI %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "tamaño anormal para una clave de sesión cifrada (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s clave de sesión cifrada\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "frase contraseña generada con algoritmo de resumen desconocido %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "la clave pública es %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados con la clave pública: DEK correcta\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado con clave %s, ID %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "descifrado de la clave pública fallido: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrado con %lu frases contraseña\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "cifrado con 1 frase contraseña\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "suponiendo %s datos cifrados\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "ATENCIÓN: la intgridad del mensaje no está protegida\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "descifrado fallido: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nombre fichero original='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "AVISO: se observan varios textos en claro\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "no se encontró firma\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma INCORRECTA de \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma caducada de \"%s\""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Firma correcta de \"%s\""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "suprimida la verificación de la firma\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "no puedo manejar estos datos ambiguos en la firma\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Firmado el %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " usando %s clave %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Firmado el %s usando clave %s ID %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " alias \"%s\""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Clave disponible en: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[incierto]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "ATENCIÓN: ¡Esta clave no está certificada por una firma de confianza!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma caducada en %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "La firma caduca el %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "firma %s, algoritmo de resumen %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binaria"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "modotexto"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "desconocido"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "Algoritmo de clave pública desconocido"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "no es una firma separada\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "AVISO: detectadas múltiples firmas. Sólo la primera se comprueba.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "firma al viejo estilo (PGP 2.x)\n"
@@@ -6049,72 -4788,59 +6026,72 @@@ msgstr "error de lectura `%s': %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opción obsoleta \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor use \"%s%s\" en su lugar\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Sin comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "sin_comprimir|ninguno"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "opción ambigua `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "opción desconocida `%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
#, 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:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6637,36 -5264,34 +6614,42 @@@ msgstr "imposible abrir datos firmados
msgid "can't open signed data fd=%d: %s\n"
msgstr "imposible abrir datos firmados fd=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "el certificado no es utilizable para cifrar\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinatario anónimo; probando clave secreta %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "de acuerdo, somos el destinatario anónimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "la antigua codificación de la DEK no puede usarse\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: clave secreta %s caducó el %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6827,7 -5424,6 +6810,7 @@@ msgstr "(No se dió descripción)\n
msgid "Is this okay? (y/N) "
msgstr "¿Es correcto? (s/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "creada clave débil - reintentando\n"
@@@ -6850,27 -5443,27 +6833,33 @@@ msgstr "la clave %s usa un hash insegur
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "la clave DSA %s requiere un resumen de %u bits al menos\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "no puede usar %s en modo %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "por favor vea %s para más información\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVISO: la subclave de cifrado %s tiene un certificado cruzado inválido\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6878,7 -5471,6 +6867,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "la clave pública %s es %lu segundos más nueva que la firma\n"
msgstr[1] "la clave pública %s es %lu segundos más nueva que la firma\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6886,7 -5478,6 +6875,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la clave pública %s es %lu segundos más nueva que la firma\n"
msgstr[1] "la clave pública %s es %lu segundos más nueva que la firma\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6901,7 -5492,6 +6890,7 @@@ msgstr[1] "
"la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
"o problemas con el reloj)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6915,41 -5505,34 +6904,41 @@@ msgstr[1] "
"la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
"o problemas con el reloj)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: clave de la firma %s caducada el %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: la clave de firmado %s ha sido revocada\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"asumiendo firma incorrecta de la clave %s por un bit crítico desconocido\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "clave %s: no hay subclave para la firma de revocación de subclave\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVISO: no puedo expandir el %% de la url de política . Se usa sin expandir.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6957,7 -5540,6 +6946,7 @@@ msgstr "
"AVISO: no puedo expandir el %% de la url de política (demasiado larga).\n"
"Se usa sin expandir.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6966,12 -5548,10 +6955,12 @@@ msgstr "
"AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
"preferido. Se usa sin expandir.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s firma de: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6979,29 -5559,23 +6968,29 @@@ msgstr "
"AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
"preferencias del destinatario\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "firmando:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "se usará un cifrado %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" omitido: duplicado\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "omitido: clave secreta ya presente\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"¡esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
@@@ -7091,7 -5649,6 +7080,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7203,149 -5738,121 +7192,149 @@@ msgstr "no se pueden manejar líneas d
msgid "input line longer than %d characters\n"
msgstr "línea de longitud superior a %d caracteres\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "error enviando opciones estándar: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algoritmo no disponible: %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "error creando fichero temporal: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: error escribiendo registro de directorio: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "error abriendo `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "lista clave e identificadores de usuario"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, 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:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista claves"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7353,14 -5860,12 +7342,14 @@@ msgid_plural "Verified %d messages.
msgstr[0] "imprime resúmenes de mensaje"
msgstr[1] "imprime resúmenes de mensaje"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, 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:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7368,61 -5873,52 +7357,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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "el algoritmo de resumen seleccionado no es válido\n"
@@@ -7430,90 -5926,75 +7419,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "error escribiendo clave: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, 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:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, fuzzy, c-format
#| msgid "second"
msgid "%lld~second"
@@@ -7521,18 -6002,15 +7510,18 @@@ msgid_plural "%lld~seconds
msgstr[0] "segundo"
msgstr[1] "segundo"
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d firmas borradas\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7540,43 -6018,35 +7529,43 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "imprime resúmenes de mensaje"
msgstr[1] "imprime resúmenes de mensaje"
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
msgid "Encrypted 0 messages."
msgstr "el algoritmo de resumen seleccionado no es válido\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Política: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7593,19 -6063,15 +7582,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, 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:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7856,19 -6277,14 +7845,19 @@@ msgstr "
"Sintaxis: kbxutil [opciones] [ficheros]\n"
"listar, exportar, importar datos Keybox\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "falta el módulo RSA o no es de %d bits\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "falta el exponente público RSA o es mayor de %d bits\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "la función de manejo del PIN devolvió un error: %s\n"
@@@ -7918,44 -6325,35 +7907,44 @@@ msgstr "
"|NP|Por favor introduzca el PIN Unblocking Code (PUK) para la clave que crea "
"firmas cualificadas."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "fallo al almacenar la huella digital: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "fallo guardando la fecha de creación: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "error recuperando el estatus CHV de la tarjeta\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "la respuesta no incluye el módulo RSA\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "la respuesta no incluye el exponente público RSA\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public key\n"
msgstr "la respuesta no incluye el exponente público RSA\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "la respuesta no incluye la clave pública\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "fallo leyendo clave pública: %s\n"
@@@ -7963,55 -6361,44 +7952,55 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "usando PIN por defecto %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Por favor introduzca PIN"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "la verificación CHV%d falló: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "¡la tarjeta está bloqueada permanentemente!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -8026,23 -6413,18 +8015,23 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Por favor introduzca PIN de Administrador"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "el acceso a órdenes de administrador no está configurado\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Por favor introduzca PIN"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Código de Reinicio demasiado corto; longitud mínima %d\n"
@@@ -8050,83 -6432,65 +8039,83 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|CR|Nuevo Código de Reinicio"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Nuevo PIN Administrador"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Nuevo PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
#| msgid "|A|Please enter the Admin PIN"
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "|A|Por favor introduzca PIN de Administrador"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please enter the PIN and New PIN"
msgstr "||Por favor introduzca PIN"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "error leyendo datos de la aplicación\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "error leyendo huella digital DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "la clave ya existe\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "la clave existente será reemplazada\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "generando nueva clave\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "escribiendo clave nueva\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "falta fecha de creación\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "el primo RSA %s falta o no es de %d bits\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "fallo al almacenar la clave: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI no disponible"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "por favor, espere mientras se genera la clave ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "la generación de la clave falló\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -8134,31 -6498,25 +8123,31 @@@ msgid_plural "key generation completed
msgstr[0] "generación de clave completada (%d segundos)\n"
msgstr[1] "generación de clave completada (%d segundos)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "estructura de la tarjeta OpenPGP inválida (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "firmas creadas hasta ahora: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@@ -8180,11 -6535,9 +8169,11 @@@ msgstr "|N|Nuevo PIN Inicial
msgid "run in multi server mode (foreground)"
msgstr "ejecutar en modo multi servidor (primer plano)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FICHERO|escribir log en FICHERO"
@@@ -8247,12 -6589,10 +8236,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "use la opción `--daemon' para ejectuar el programa en segundo plano\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "manejador del descriptor %d iniciado\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "manejador del descriptor %d terminado\n"
@@@ -8328,9 -6653,6 +8317,9 @@@ msgstr "número de certificados coincid
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "fallo buscando la clave sólo caché de dirmngr: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "fallo al reservar handle de keyDB\n"
@@@ -8503,7 -6785,6 +8492,7 @@@ msgstr "modelo de validación usado: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(es el algoritmo MD2)\n"
@@@ -8546,7 -6820,6 +8535,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "error obteniendo información sobre uso de la clave: %s\n"
@@@ -8830,11 -7050,9 +8819,11 @@@ msgstr "Acabado. Debería mandar esta p
msgid "resource problem: out of core\n"
msgstr "problema de recursos: memoria desbordada\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(el algoritmo RC2)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(no parece un mensaje cifrado)\n"
@@@ -8866,91 -7079,69 +8855,91 @@@ msgstr "certificado `%s' borrado\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "borrado del certificado \"%s\" fallido: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "no se dieron receptores válidos\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "lista claves externas"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "lista de cadenas de certificados"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "importa certificado"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "exporta certificado"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "registrar tarjeta inteligente"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "pasar una orden a dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "invocar gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "crea una salida en base-64"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "asumir entrada en formato PEM"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "asumir entrada en formato base-64"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "asumir entrada en formato binario"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "nunca consultar una CRL"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "comprabar validez usando OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|número de certificados que incluir"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FICHERO|tomar política de información de FICHERO"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "no comprobar políticas de certificados"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "recuperar certificados de emisor perdidos"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "no usa la terminal en absoluto"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FICHERO|escribir un log en modo servidor en FICHERO"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHERO|escribir inform de auditoría a FICHERO"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
@@@ -8960,41 -7151,32 +8949,41 @@@
# Además una de las acepciones de asumir es "aceptar algo" y suponer
# viene a ser asumir una idea como propia. Suponer "sí" en casi todas las
# preguntas no me acaba de gustar.
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "asume \"sí\" en casi todas las preguntas"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FICHERO|añade este anillo a la lista de anillos"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ESPEC|usa este servidor para buscar claves"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -9009,50 -7191,41 +8998,50 @@@ msgstr "
"firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
"la operación por defecto depende de los datos de entrada\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "NOTA: no se podrá cifrar a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "modelo de validación desconocido `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: falta el nombre del host\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: se dio contraseña sin usuario\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: omitir esta línea\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "no se puede interpretar el servidor de claves\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importando certificados comunes `%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "no puedo firmar usando `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "orden inválida (no hay orden implícita)\n"
@@@ -9113,7 -7274,6 +9102,7 @@@ msgstr "problema re-buscando el certifi
msgid "error storing flags: %s\n"
msgstr "error almacenando parámetros: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Error - "
@@@ -9149,7 -7305,6 +9138,7 @@@ msgstr "
"\n"
"%s%sEstá realmente seguro de querer hacer esto?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9168,48 -7322,38 +9157,48 @@@ msgstr "
"\"%s\"\n"
"¡Observe que este certificado NO creará una firma cualificada!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "resumen %d (%s) para firmante %d no puede utilizarse; usando %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "algoritmo de hash usado para el firmante %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "la comprobación de la firma cualificada falló: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Firmado el "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[no hay fecha]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "usando el certificado ID 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr "firma inválida: el resumen del mensaje no coincide con el calculado\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Firma correcta de"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " alias"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Es una firma cualificada\n"
@@@ -10093,122 -8076,95 +10082,122 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "|FILE|run commands from FILE on startup"
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHERO|ejecuta órdenes de FICHERO al empezar"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "pasar una orden a dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "¿Salir sin grabar? (s/N) "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "permitir búsquedas PKA (peticiones DNS)"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|usar servidor de claves en URL"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
@@@ -10216,7 -8172,6 +10205,7 @@@
# página man -> página de manual
# Vale. ¿del manual mejor?
# Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10229,13 -8184,11 +10218,13 @@@ msgstr "
"@\n"
"(Véase en la página del manual la lista completo de órdenes y opciones)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10247,88 -8200,71 +10236,88 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "el nivel de depuración `%s` no es válido\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "uso: gpgsm [opciones] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "¡%s no permitido con %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "renombrando `%s' en `%s' fallo: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
msgstr "la conversión de `%s' en `%s' falló: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
#| msgid "line too long - skipped\n"
msgid "%s:%u: line too long - skipped\n"
msgstr "línea demasiado larga -omitida\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "huella dactilar no válida"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "error de lectura `%s': %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forzado"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10520,7 -8420,16 +10509,20 @@@ msgstr "`%s' no es un fichero JPEG\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ #| msgid "error running `%s': exit status %d\n"
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "error ejecutando `%s': código de finalización %d\n"
+
++#: dirmngr/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"
+ msgstr "error reservando memoria: %s\n"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
#| msgid "error writing to %s: %s\n"
msgid "error printing log line: %s\n"
@@@ -10592,12 -8489,10 +10594,12 @@@ msgstr "enviando clave %s a %s servido
msgid "malloc failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10670,13 -8553,6 +10672,7 @@@ msgstr "error escribiendo en `%s': %s\n
msgid "error reading HTTP response for '%s': %s\n"
msgstr "error leyendo de %s: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- #| msgid "error running `%s': exit status %d\n"
- msgid "error accessing '%s': http status %u\n"
- msgstr "error ejecutando `%s': código de finalización %d\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
@@@ -10809,87 -8661,71 +10805,87 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "fallo mandando la línea: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "fallo mandando la línea: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
#| msgid "cannot allocate outfile string: %s\n"
msgid "can't allocate control structure: %s\n"
msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
#| msgid "failed to create stream from socket: %s\n"
msgid "failed to allocate assuan context: %s\n"
msgstr "fallo al crear un flujo desde el socket: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "inicialización de la base de datos de confianza fallida: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "fallo guardando la fecha de creación: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, fuzzy, c-format
#| msgid "user '%s' list problem: %s\n"
msgid "Assuan accept problem: %s\n"
msgstr "problema lista usuario '%s': %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -11043,162 -8850,121 +11039,162 @@@ msgstr "fallo mandando la línea: %s\n
msgid "error sending standard options: %s\n"
msgstr "error enviando opciones estándar: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Opciones que controlan la salida de diagnósticos"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Opciones que controlan la configuración"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Opciones útiles para el depurado"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Opciones que controlan la seguridad"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|las claves SSH caducan en N segundos"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Opciones que fuerzan una política de frases contraseña"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "no permitir evitar la política de frases contraseña"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|establecer longitud mínima para nuevas frases contraseña en N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|pedir al menos N caracteres no alfabéticos para nuevas contraseñas"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FICHERO|comprobar nuevas frases contraseña con el patrón en FICHERO"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|frase contraseña caduca tras N días"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "no permite reusar antiguas frases contraseña"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOMBRE|cifra para el ususario NOMBRE también"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|ESPEC|establecer alias de email"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Configuración para servidores de claves"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|usar servidor de claves en URL"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "permitir búsquedas PKA (peticiones DNS)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MECANISMOS|usa MECANISMOS para encontrar claves por emails"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "prohibir todo acceso al dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOMBRE|usa la codificación NOMBRE para frases contraseña PKCS#12"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "no comprobar CRLs para certificados raíz"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Opciones que controlan el formato de la salida"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Opciones que controlan la interactividad y obligación"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Opciones que controlan la seguridad"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Configuración de servidores HTTP"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "usar configuración del proxy HTTP del sistema"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Configuración de servidores LDAP que se usará"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "lista de servidores LDAP"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Configuración de OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
@@@ -11213,34 -8979,28 +11209,34 @@@ msgstr "error de red
# ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
# ¿Es que son más listos? :-)
#
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Frase contraseña errónea"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Componente no encontrado"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Verificación externa del componente %s fallida"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Note que las especificación de grupo se ignoran\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing '%s'\n"
msgstr "error cerrando %s: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -11322,13 -9066,11 +11318,13 @@@ msgstr "usa como fichero de salida
msgid "activate changes at runtime, if possible"
msgstr "activar cambios en tiempo de ejecución, si es posible"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11340,15 -9082,12 +11336,15 @@@ msgstr "
"Sintaxis: gpgconf [opciones]\n"
"Administrar opciones de configuración de las herramientas GnuPG\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Necesita un argumento de un componente"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Componente no encontrado"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "No se permiten parámetros"
diff --cc po/et.po
index e508b0c,d9381bd..fe9d843
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -15,7 -14,6 +15,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@@ -26,40 -24,31 +26,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "vigane parool
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -77,75 -65,59 +77,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "halb parool"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "rida on liiga pikk\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "liiga pikk parool\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Lubamatu sümbol nimes\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "halb MPI"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "halb parool"
@@@ -155,152 -126,111 +155,152 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuda parooli"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Korrake parooli: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Korrake parooli: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Korrake parooli: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "parooli ei korratud õieti; proovige uuesti"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "parooli ei korratud õieti; proovige uuesti"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "parooli ei korratud õieti; proovige uuesti"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -379,8 -296,6 +379,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuda parooli"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -390,124 -305,95 +390,128 @@@ msgstr "
"Võtmed:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Võti on asendatud"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "ole jutukas"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole mõnevõrra vaiksem"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "otsi võtmeid võtmeserverist"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "uuenda usalduse andmebaasi"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NIMI|terminali kooditabel on NIMI"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei ole toetatud"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,179 -402,136 +520,184 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "valitud lühendi algoritm ei ole lubatud\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei õnnestu luua: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: kataloogi ei õnnestu luua: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: jätsin vahele: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -539,6 +705,9 @@@ msgstr "
"@Käsud:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -752,8 -584,6 +761,8 @@@ msgstr "Katkesta
msgid "error while asking for the passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -812,8 -633,6 +821,8 @@@ msgstr "
msgid "Yes"
msgstr "jah"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -864,19 -676,16 +873,19 @@@ msgstr "muuda parooli
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "luba võti"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -896,7 -702,6 +905,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
@@@ -937,8 -732,6 +946,8 @@@ msgstr "viga parooli loomisel: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -1066,7 -833,6 +1075,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "viga võtmehoidla `%s' loomisel: %s\n"
@@@ -1081,7 -845,6 +1090,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1196,8 -936,6 +1205,8 @@@ msgstr "%s: võtmehoidla on loodud\n
msgid "algorithm: %s"
msgstr "pakend: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1389,7 -1089,6 +1398,7 @@@ msgstr "vigased impordi võtmed\n
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "vigased impordi võtmed\n"
@@@ -1414,7 -1109,6 +1423,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "ei töödeldud"
@@@ -1473,8 -1156,6 +1482,8 @@@ msgstr "ei leia avalikku võtit %08lX:
msgid "waiting for lock %s...\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1606,7 -1261,6 +1615,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1615,35 -1268,33 +1624,42 @@@
msgid "Enter passphrase: "
msgstr "Sisestage parool: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "viga võtmehoidla `%s' loomisel: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "HOIATUS: %s määrab üle %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s ei tööta veel koos %s-ga\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "salajane võti ei ole kättesaadav"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
@@@ -1653,15 -1303,10 +1669,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "See käsklus ei ole %s moodis lubatud.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Teie valik? "
@@@ -1723,154 -1355,107 +1739,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "vastavat avalikku võtit pole: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "uuendatud eelistused"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "lubamatu sümbol eelistuste sõnes\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "lubamatu sümbol eelistuste sõnes\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "viga: vigane sõrmejälg\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "näita sõrmejälge"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "viga: vigane sõrmejälg\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Võtme genereerimine ebaõnnestus: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "ei leia OpenPGP andmeid.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Millist võtmepikkust te soovite? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Millist võtmepikkust te soovite? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Millist võtmepikkust te soovite? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "ümardatud üles %u bitini\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "jätsin vahele: avalik võti on juba olemas\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1878,179 -1463,135 +1879,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Allkiri aegus %s\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Vigane valik.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Palun valige tühistamise põhjus:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "See käsklus ei ole %s moodis lubatud.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "jätsin vahele: avalik võti on juba olemas\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Allkirjastan tõesti? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "välju sellest menüüst"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "vastuolulised käsud\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "näita seda abiinfot"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Võtme leiate: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "muuda aegumise kuupäeva"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "muuda omaniku usaldust"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "näita sõrmejälge"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "genereeri uus võtmepaar"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "vastuolulised käsud\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "vastuolulised käsud\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane käsklus (proovige \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga võtmebloki lugemisel: %s\n"
@@@ -2112,46 -1641,46 +2113,57 @@@ msgstr "avaliku võtme \"%s\" jaoks on
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "kasutan šiffrit %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "HOIATUS: `%s' on tühi fail\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "loen failist `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2159,38 -1688,32 +2171,39 @@@
msgstr ""
"pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krüptitud kasutajale: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krüpteeritud andmed\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krüpteeritud tundmatu algoritmiga %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "HOIATUS: teade on krüptitud sümmeetrilise šifri nõrga võtmega.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "probleem krüptitud paketi käsitlemisel\n"
@@@ -2283,40 -1789,31 +2296,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: jätsin vahele: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "kirjutan faili `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -2386,236 -1870,188 +2399,241 @@@ msgstr "|NIMI|kasuta NIME vaikimisi sal
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "vigased impordi võtmed\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "krüpteeri andmed"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "dekrüpteeri andmed (vaikimisi)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "kontrolli allkirja"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "näita võtmeid"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "näita võtmeid ja allkirju"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli võtmete allkirju"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "näita võtmeid ja sõrmejälgi"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "näita salajasi võtmeid"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "genereeri tühistamise sertifikaat"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "eemalda võtmed avalike võtmete hoidlast"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "eemalda võtmed salajaste võtmete hoidlast"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allkirjasta võti"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allkirjasta võti lokaalselt"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "allkirjasta võti"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "allkirjasta võti lokaalselt"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "allkirjasta või toimeta võtit"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "ekspordi võtmed"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "ekspordi võtmed võtmeserverisse"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "impordi võtmed võtmeserverist"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "otsi võtmeid võtmeserverist"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "uuenda võtmeid võtmeserverist"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "impordi/mesti võtmed"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [failid]|trüki teatelühendid"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "loo ascii pakendis väljund"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|krüpti NIMEle"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|määra pakkimise tase N (0 blokeerib)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ära tee mingeid muutusi"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "küsi enne ülekirjutamist"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2623,7 -2059,6 +2641,7 @@@ msgstr "
"@\n"
"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2653,13 -2088,11 +2671,13 @@@ msgstr "
" --list-keys [nimed] näita võtmeid\n"
" --fingerprint [nimed] näita sõrmejälgi\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2674,7 -2107,6 +2692,7 @@@ msgstr "
"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
"vaikimisi operatsioon sõltub sisendandmetest\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2682,546 -2114,415 +2700,528 @@@ msgstr "
"\n"
"Toetatud algoritmid:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Avalik võti: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Šiffer: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Räsi: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Pakkimine: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "kasuta: gpg [võtmed] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "vastuolulised käsud\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tundmatu seade \"%s\"\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "vigane räsialgoritm `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi võtmed\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi võtmed\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s määrab üle %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos mõtet!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud šifri algoritm ei ole lubatud\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud šifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku šifri eelistused\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku lühendi eelistused\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei tööta veel koos %s-ga\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "võtme eksport ebaõnnestus: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine ebaõnnestus: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine ebaõnnestus: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "vigane räsialgoritm `%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage nüüd oma teade ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@@ -3235,7 -2534,6 +3235,7 @@@ msgstr "võta võtmed sellest võtmehoi
msgid "make timestamp conflicts only a warning"
msgstr "teata ajatemplite konfliktist ainult hoiatusega"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
@@@ -3266,333 -2559,270 +3266,338 @@@ msgstr "Abiinfo puudub
msgid "No help available for '%s'"
msgstr "`%s' kohta abiinfo puudub"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "näita sõrmejälge"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "mittekasutatav salajane võti"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "näita sõrmejälge"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "jätan bloki tüübiga %d vahele\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu võtit on seni töödeldud\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Töödeldud kokku: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " vahele jäetud uusi võtmeid: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " vahele jäetud uusi võtmeid: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " puudub kasutaja ID: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " imporditud: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muutmata: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusi kasutajaid: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusi alamvõtmeid: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusi tühistamisi: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " loetud salajasi võtmeid: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " salajasi võtmeid imporditud: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muutmata salajasi võtmeid: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " pole imporditud: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " loetud salajasi võtmeid: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "võti %08lX: kasutaja ID puudub\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "`%s' jätsin vahele: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "võti %08lX: HKP alamvõtme rike parandatud\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "võti %08lX: uus võti - jätsin vahele\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "võti %08lX: ei sobi meie koopiaga\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "võti %08lX: \"%s\" 1 uus allkiri\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "võti %08lX: \"%s\" ei muudetud\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "võti %08lX: salajane võti on imporditud\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "jätsin vahele: avalik võti on juba olemas\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salajast võtit `%s' ei leitud: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "võti %08lX: salajane võti vigase šifriga %d - jätsin vahele\n"
@@@ -3607,140 -2837,113 +3612,140 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "võti %08lX: vigane alamvõtme seos\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "võti %08lX: jätsin vahele kasutaja ID '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "võti %08lX: jätsin alamvõtme vahele\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
@@@ -3782,79 -2978,12 +3787,15 @@@ msgstr "viga `%s' lugemisel: %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[tühistamine]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Korrektne allkiri kasutajalt \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "`%s' jätsin vahele: %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
- msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
- msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d halba allkirja\n"
- msgstr[1] "%d halba allkirja\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Korrektne allkiri kasutajalt \""
- msgstr[1] "Korrektne allkiri kasutajalt \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3867,68 -2996,53 +3808,68 @@@ msgstr "
"passe, kontrollige erinevatest allikatest näpujälgi...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Usaldan vähesel määral\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Usaldan täiesti\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kasutaja ID \"%s\" on tühistatud."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Ei saa allkirjastada.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kasutaja ID \"%s\" on aegunud."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Allkirjastan tõesti? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3937,11 -3051,9 +3878,11 @@@ msgstr "
"Iseenda allkiri \"%s\"\n"
"on PGP 2.x stiilis allkiri.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3950,11 -3062,9 +3891,11 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on aegunud.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3963,44 -3073,35 +3904,44 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on lokaalne allkiri.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Võtmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "See võti on aegunud!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "See võti aegub %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4010,32 -3111,26 +3951,32 @@@ msgstr "
"kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
"sisestage \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ma ei vasta.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ma ei ole üldse kontrollinud.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ma olen kontrollinud väga hoolikalt.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4044,265 -3139,211 +3985,265 @@@ msgstr "
"Olete tõesti kindel, et soovite seda võtit oma\n"
"võtmega allkirjastada: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"See saab olema iseenda allkiri.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"HOIATUS: allkirja ei märgita mitte-eksporditavaks.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"HOIATUS: allkirja ei märgita kehtetuks mitte-tunnistatavaks.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Allkiri märgitakse mitte-eksporditavaks.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Ma ei ole seda võtit üldse kontrollinud.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Ma olen kontrollinud seda võtit väga hoolikalt.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Allkirjastan tõesti? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine ebaõnnestus: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "salvesta ja välju"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "näita sõrmejälge"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "näita võtit ja kasutaja IDd"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "tühista allkirjad"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allkirjasta võti lokaalselt"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "lisa kasutaja ID"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "lisa foto ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "kustuta kasutaja ID"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "kustuta sekundaarne võti"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "lisa tühistamise võti"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "v3 võtme aegumise aega ei saa muuta.\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "märgi kasutaja ID primaarseks"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "näita eelistusi (ekspert)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "näita eelistusi (detailsena)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "muuda parooli"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "tühista kasutaja ID"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "tühista sekundaarne võti"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "luba võti"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "blokeeri võti"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "näita foto ID"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Salajane võti on kasutatav.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast võtit.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4310,294 -3351,240 +4251,304 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Võti on tühistatud."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tundmatu allkirja klass"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "See käsklus ei ole %s moodis lubatud.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Kas eemaldan tõesti selle kasutaja ID? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Kas eemaldan tõesti selle kasutaja ID? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Te peata valima vähemalt ühe võtme.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "`%s' ei õnnestu avada: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "viga võtmehoidla `%s' loomisel: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Te peata valima vähemalt ühe võtme.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Kas te tõesti soovite seda võtit kustutada? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Kas tühistan tõesti selle kasutaja ID? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Kas te tõesti soovite seda võtit tühistada? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Kas te tõesti soovite seda võtit tühistada? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "sea eelistuste nimekiri"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Kas tõesti uuendan seaded? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvestan muutused? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Väljun salvestamata? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "viga: vigane sõrmejälg\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "vigane väärtus\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Võtmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "viga: vigane sõrmejälg\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Teatelühend: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Omadused: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Noteering: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Selle võtme võib olla tühistanud %s võti "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Selle võtme võib olla tühistanud %s võti "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (tundlik)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s ei õnnestu luua: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[tühistatud] "
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "See võti on blokeeritud"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4605,20 -3592,14 +4556,20 @@@ msgstr "
"Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n"
"näidatud võtme kehtivus olla tingimata korrektne.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4626,17 -3607,14 +4577,17 @@@ msgstr "
"HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks. See käsklus võib\n"
" põhjustada muu kasutaja ID primaarseks määramist.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "v3 võtme aegumise aega ei saa muuta.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4645,35 -3623,27 +4596,35 @@@ msgstr "
"HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n"
" PGP versioone seda võtit tagasi lükkama.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4681,38 -3651,31 +4632,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Kustutatud %d allkiri.\n"
msgstr[1] "Kustutatud %d allkiri.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "vigane pakend"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Kasutaja ID \"%s\" on tühistatud."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4721,39 -3684,31 +4672,39 @@@ msgstr "
"HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n"
" põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Sisestage määratud tühistaja kasutaja ID: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4761,178 -3716,145 +4712,183 @@@
msgstr ""
"Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muudan sekundaarse võtme aegumise aega.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse võtme aegumise aega.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3 võtme aegumise aega ei saa muuta.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige täpselt üks kasutaja ID.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Kirjutan üle (j/E)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "kasutaja ID: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " allkirjastanud %08lX %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " tühistanud %08lX %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute tühistama järgmisi allkirju:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "salajast võtit pole\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "vigased impordi võtmed\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "eelistus %c%lu on duplikaat\n"
@@@ -5377,8 -4222,6 +5333,8 @@@ msgstr "
"kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
"koguda paremat entroopiat.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Võtme genereerimine ebaõnnestus: %s\n"
@@@ -5450,7 -4280,6 +5406,7 @@@ msgstr "viga avaliku võtme võtmehoidl
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5460,63 -4289,50 +5416,63 @@@ msgstr "
"Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
"kasutades võtit \"--edit-key\".\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "MÄRKUS: v3 võtmetele alamvõtmete loomine ei ole OpenPGP ühilduv\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon tõesti? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "mitte kunagi"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kriitiline allkirja poliitika: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Allkirja poliitika: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kriitiline allkirja noteerimine: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5524,7 -4340,20 +5480,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d halba allkirja\n"
msgstr[1] "%d halba allkirja\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d halba allkirja\n"
+ msgstr[1] "%d halba allkirja\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
+ msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5532,41 -4361,33 +5504,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 allkiri jäi vea tõttu kontrollimata\n"
msgstr[1] "1 allkiri jäi vea tõttu kontrollimata\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Võtmehoidla"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Primaarse võtme sõrmejälg:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Alamvõtme sõrmejälg:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Primaarse võtme sõrmejälg:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Alamvõtme sõrmejälg:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Võtme sõrmejälg ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5676,263 -4476,214 +5648,269 @@@ msgstr "võtit '%s' ei leitud: %s\n
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "`%s' jätsin vahele: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allkirjastatud teie võtmega %08lX %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "veider suurus krüptitud sessiooni võtme jaoks (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s krüpteeritud sessiooni võti\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "krüpteeritud tundmatu algoritmiga %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "avalik võti on %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ka \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "krüpteeritud %s võtmega, ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "krüpteeritud kasutades %lu parooli\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "krüpteeritud ühe parooliga\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "eeldan %s krüpteeritud andmeid\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA šiffer pole saadaval, loodan kasutada selle asemel %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "lahtikrüpteerimine õnnestus\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "algne failinimi on='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "HALB allkiri kasutajalt \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Aegunud allkiri kasutajalt \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "allkirja kontroll jäeti ära\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neid allkirju ei õnnestu töödelda\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ka \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " ka \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Võtme leiate: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[ebakindel]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ka \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Allkiri aegub %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binaarne"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "tekstimood"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "tundmatu"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tundmatu avaliku võtme algoritm"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allkirja ei saa kontrollida: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "ei ole eraldiseisev allkiri\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "vana stiili (PGP 2.x) allkiri\n"
@@@ -5993,67 -4733,54 +5971,67 @@@ msgstr "viga lugemisel: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "palun kasutage selle asemel \"%s%s\"\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Pakkimata"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "Pakkimata"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "loen võtmeid failist `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "tundmatu allkirja klass"
@@@ -6563,35 -5191,32 +6541,40 @@@ msgstr "allkirjastatud andmete avamine
msgid "can't open signed data fd=%d: %s\n"
msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "võti %08lX: kasutaja ID puudub\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonüümne saaja; proovin salajast võtit %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, me oleme anonüümne teate saaja.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "vana DEK kodeerimine ei ole toetatud\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "šifri algoritm %d%s on tundmatu või blokeeritud\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "MÄRKUS: šifri algoritm %d puudub eelistustes\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6757,7 -5354,6 +6740,7 @@@ msgstr "(Kirjeldust ei antud)\n
msgid "Is this okay? (y/N) "
msgstr "On see hästi? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "loodi nõrk võti - proovin uuesti\n"
@@@ -6778,40 -5371,38 +6761,46 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "%s ei ole moodis %s lubatud.\n"
+
++#: g10/sig-check.c:191
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = esita palun täiendavat infot\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "HOIATUS: allkirjastamise alamvõtmel %08lX on vigane rist-sertifikaat\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
msgstr[1] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
msgstr[1] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6820,7 -5411,6 +6809,7 @@@ msgid_plural "
msgstr[0] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
msgstr[1] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6828,39 -5418,32 +6817,39 @@@
msgstr[0] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
msgstr[1] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "MÄRKUS: võti on tühistatud"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "eeldan tundmatu kriitilise biti tõttu võtmel %08lX vigast allkirja\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "võti %08lX: alamvõtme tühistamise paketile puudub alamvõti\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "võti %08lX: alamvõtme allkirjaga sidumiseks puudub alamvõti\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"HOIATUS: noteerimise %%-asendus ebaõnnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6868,7 -5451,6 +6857,7 @@@ msgstr "
"HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6877,42 -5459,34 +6866,42 @@@ msgstr "
"HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s allkiri kasutajalt: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "allkirjastan:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s krüpteerimist\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "`%s' jätsin vahele: duplikaat\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "jätsin vahele: avalik võti on juba olemas\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7001,7 -5559,6 +6990,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "`%s' ei õnnestu sulgeda: %s\n"
@@@ -7113,149 -5648,120 +7102,149 @@@ msgstr "ei suuda käsitleda tekstiridu
msgid "input line longer than %d characters\n"
msgstr "sisendrida on pikem, kui %d sümbolit\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Toetatud algoritmid:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Poliis: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "näita võtmeid"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7263,68 -5769,58 +7252,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:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [failid]|trüki teatelühendid"
@@@ -7332,149 -5828,123 +7321,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Kustutatud %d allkirja.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "krüpteeritud kasutades %lu parooli\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Poliis: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7491,18 -5961,14 +7480,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7738,19 -6159,14 +7727,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7799,44 -6206,35 +7788,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "eemalda võtmed avalike võtmete hoidlast"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@@ -7844,54 -6242,43 +7833,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "muuda parooli"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7901,26 -6288,21 +7890,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "muuda parooli"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "muuda parooli"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Palun valige tühistamise põhjus:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7928,117 -6310,93 +7917,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "muuda parooli"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "muuda parooli"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "viga võtmebloki lugemisel: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' on juba pakitud\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "genereeri uus võtmepaar"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "genereeri uus võtmepaar"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "mittetoetatud URI"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Võtme genereerimine ebaõnnestus: %s\n"
msgstr[1] "Võtme genereerimine ebaõnnestus: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ei leia OpenPGP andmeid.\n"
@@@ -8059,11 -6414,9 +8048,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
@@@ -8119,12 -6461,10 +8108,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8199,9 -6524,6 +8188,9 @@@ msgstr "viga parooli loomisel: %s\n
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@@ -8388,7 -6670,6 +8377,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8432,7 -6706,6 +8421,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -8696,11 -6916,9 +8685,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8729,139 -6942,108 +8718,139 @@@ msgstr "eelistus %c%lu on duplikaat\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Kirjeldust ei antud)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "näita salajasi võtmeid"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "halb sertifikaat"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "halb sertifikaat"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "halb sertifikaat"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "loo ascii pakendis väljund"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "ära kasuta terminali"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "pakettmood: ära küsi kunagi"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "eelda enamus küsimustele jah vastust"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "eelda enamus küsimustele ei vastust"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda võtmeserverit"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|kasuta šifri algoritmi NIMI"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8872,47 -7054,38 +8861,47 @@@ msgstr "
"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
"vaikimisi operatsioon sõltub sisendandmetest\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Kirjeldust ei antud)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " j = jäta see võti vahele\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjutan faili `%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "`%s' ei õnnestu sulgeda: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8975,7 -7136,6 +8964,7 @@@ msgstr "rev? probleem tühistamise kont
msgid "error storing flags: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9004,7 -7160,6 +8993,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9018,51 -7172,41 +9007,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Allkiri aegus %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "viga parooli loomisel: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Korrektne allkiri kasutajalt \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " ka \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9863,116 -7846,88 +9852,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Väljun salvestamata? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9985,91 -7940,72 +9974,91 @@@ msgstr "
"@\n"
"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "kasuta: gpg [võtmed] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "pakendamine ebaõnnestus: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "pakendamine ebaõnnestus: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rida on liiga pikk\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "viga: vigane sõrmejälg\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "viga lugemisel: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei töödeldud"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10249,7 -8149,14 +10238,18 @@@ msgstr "\"%s\": ei ole JPEG fail\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "viga `%s' lugemisel: %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -10314,12 -8209,10 +10314,12 @@@ msgstr "otsin \"%s\" HKP serverist %s\n
msgid "malloc failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10383,12 -8264,6 +10383,7 @@@ msgstr "viga võtmehoidlasse `%s' kirju
msgid "error reading HTTP response for '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "viga `%s' lugemisel: %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -10507,77 -8358,61 +10502,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allkirjastamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allkirjastamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "`%s' ei õnnestu luua: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10714,193 -8520,146 +10709,193 @@@ msgstr "allkirjastamine ebaõnnestus: %
msgid "error sending standard options: %s\n"
msgstr "viga teate saatmisel serverile `%s': %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|kasuta parooli moodi N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "viga parooli loomisel: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NIMI|krüpti NIMEle"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NIMI|kasuta paroolidega šifri algoritmi NIMI"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "võrgu viga"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "halb parool"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "ei leia avalikku võtit"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -10973,27 -8716,22 +10968,27 @@@ msgstr "kasuta väljundfailina
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "ei leia avalikku võtit"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "kirjutan salajase võtme faili `%s'\n"
diff --cc po/fi.po
index cf83f8e,6b145e4..e56b128
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -31,7 -30,6 +31,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@@ -42,40 -40,31 +42,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "väärä salasana
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -93,75 -81,59 +93,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "väärä salasana"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "rivi on liian pitkä\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "salasana on liian pitkä\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Nimessä on epäkelpo merkki\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "MPI ei kelpaa"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "väärä salasana"
@@@ -171,152 -142,111 +171,152 @@@
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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuta salasanaa"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Toista salasana: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Toista salasana: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Toista salasana: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -395,8 -312,6 +395,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuta salasanaa"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -406,124 -321,95 +406,128 @@@ msgstr "
"Valitsimet:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Avain on uusittu"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "monisanainen"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "etsi avaimia avainpalvelimelta"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "päivitä luottamustietokanta"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei tuettu"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -532,180 -418,137 +536,185 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "valittu tiivistealgoritmi ei kelpaa\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -713,9 -556,6 +722,9 @@@ msgstr "
"@Komennot:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -769,8 -601,6 +778,8 @@@ msgstr "Peru
msgid "error while asking for the passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -829,8 -650,6 +838,8 @@@ msgstr "
msgid "Yes"
msgstr "kyllä|kylla|joo"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -881,19 -693,16 +890,19 @@@ msgstr "muuta salasanaa
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "ota avain käyttöön"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -913,7 -719,6 +922,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
@@@ -954,8 -749,6 +963,8 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -1083,7 -850,6 +1092,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@@ -1098,7 -862,6 +1107,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1213,8 -953,6 +1222,8 @@@ msgstr "%s: avainrengas luotu\n
msgid "algorithm: %s"
msgstr "ascii-koodaus: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1406,7 -1106,6 +1415,7 @@@ msgstr "virheelliset tuontivalitsimet\n
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "virheelliset tuontivalitsimet\n"
@@@ -1431,7 -1126,6 +1440,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "ei käsitelty"
@@@ -1490,8 -1173,6 +1499,8 @@@ msgstr "julkista avainta %08lX ei löyd
msgid "waiting for lock %s...\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1625,7 -1280,6 +1634,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1634,35 -1287,33 +1643,42 @@@
msgid "Enter passphrase: "
msgstr "Syötä salasana: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s ja %s eivät vielä toimi yhdessä\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "salaista avainta ei löydy"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
@@@ -1672,15 -1322,10 +1688,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Valintasi? "
@@@ -1742,154 -1374,107 +1758,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "ei vastaavaa julkista avainta: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "päivitä valinnat"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "näytä sormenjälki"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1897,179 -1482,135 +1898,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Valinta ei kelpaa.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Valitse mitätöinnin syy:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "ulos tästä valikosta"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "näytä tämä ohje"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Avain saatavilla kohteessa: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "muuta voimassoloaikaa"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "muuta luottamusastetta"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "näytä sormenjälki"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "luo uusi avainpari"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
@@@ -2131,84 -1660,78 +2132,96 @@@ msgstr "julkiselle avaimelle \"%s\" lö
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "käytetään salakirjoitusalgoritmia %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "luetaan kohteesta \"%s\"\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s salattu vastaanottajalle: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s salattua dataa\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "salattu tuntemattomalla algoritmilla %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
"esiintyvällä heikolla avaimella.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "ongelma käsiteltäessä salattua pakettia\n"
@@@ -2298,40 -1804,31 +2311,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ohitettu: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2401,236 -1885,188 +2414,241 @@@ msgstr "|NIMI|käytä oletusarvoisesti
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "virheelliset tuontivalitsimet\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "salaa tiedot"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "näytä avaimet"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "näytä avaimet allekirjoituksineen"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "vie avaimia"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "vie avaimia palvelimelle"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "nouda avaimia avainpalvelimelta"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "etsi avaimia avainpalvelimelta"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, 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:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "älä tee muutoksia"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2639,7 -2075,6 +2657,7 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2668,13 -2103,11 +2686,13 @@@ msgstr "
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2689,7 -2122,6 +2707,7 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2697,547 -2129,416 +2715,529 @@@ msgstr "
"\n"
"Tuetut algoritmit:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "JulkAvain: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Salaus: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Tiiviste: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Pakkaus: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "käyttö: gpg [valitsimet] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@@ -3251,7 -2550,6 +3251,7 @@@ msgstr "ota avaimet tästä avainrenkaa
msgid "make timestamp conflicts only a warning"
msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
@@@ -3282,334 -2575,271 +3282,339 @@@ msgstr "Ei ohjeita saatavilla
msgid "No help available for '%s'"
msgstr "Ei ohjetta aiheesta \"%s\""
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "näytä sormenjälki"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "salaista avainta ei voi käyttää"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "näytä sormenjälki"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "ohitetaan tyypin %d lohko\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "tähän mennessä käsitelty %lu avainta\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Kaikkiaan käsitelty: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ilman käyttäjätunnuksia: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " tuotu: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muuttamatonta: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusia käyttäjätunnuksia: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusia aliavaimia: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusia avainten mitätöintejä: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tuotuja salaisia avaimia: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muuttamattomia salaisia avaimia: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ei tuotu: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "avain %08lX: uusi avain - ohitetaan\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "avain %08lX: \"%s\" ei muutoksia\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "avain %08lX: salainen avain tuotu\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
@@@ -3624,142 -2854,115 +3629,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "avain %08lX: käyttäjätunnus ohitettu '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "avain %08lX: aliavain ohitettu\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
"ei saatavilla.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@@ -3801,80 -2997,12 +3806,15 @@@ msgstr "virhe luettaessa tiedostoa \"%s
msgid "failed to rebuild keyring cache: %s\n"
msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[mitätöinti]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[oma-allekirjoitus]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
-
- # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Allekirjoitus täsmää lähettäjään \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "ohitetaan \"%s\": %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
- msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
- msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d väärää allekirjoitusta\n"
- msgstr[1] "%d väärää allekirjoitusta\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Allekirjoitus täsmää lähettäjään \""
- msgstr[1] "Allekirjoitus täsmää lähettäjään \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3887,68 -3015,53 +3827,68 @@@ msgstr "
"lähteistä...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Luotan osittain\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Luotan täysin\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Allekirjoittaminen ei onnistu.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3957,13 -3070,11 +3897,13 @@@ msgstr "
"Oma-allekirjoitus kohteessa \"%s\"\n"
"on PGP 2.x -muodon allekirjoitus.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
"(k/E) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3972,11 -3083,9 +3912,11 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on vanhentunut.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3985,44 -3094,35 +3925,44 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on paikallinen allekirjoitus.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Tämä avain on vanhentunut!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Avain vanhenee %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4031,32 -3131,26 +3971,32 @@@ msgstr "
"Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
"Jos et tiedä vastausta, syötä \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) En vastaa.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) En ole tarkistanut lainkaan.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Olen suorittanut arkisen tarkistuksen.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4065,265 -3159,211 +4005,265 @@@ msgstr "
"Haluatko varmasti allekirjoittaa tämän avaimen\n"
"omalla avaimellasi: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Tämä tulee olemaan oma-allekirjoitus.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"En ole tarkistanut tätä avainta lainkaan.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen arkisesti.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen erittäin huolellisesti.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "tallenna ja lopeta"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "näytä sormenjälki"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "näytä avaimet ja käyttäjätunnukset"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "mitätöi allekirjoitus"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "lisää käyttäjätunnus"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "lisää valokuva"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "poista käyttäjätunnus"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "poista toissijainen avain"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "lisää mitätöintiavain"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "merkitse käyttäjätunnus ensisijaiseksi"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "näytä valinnat (asiantuntija)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "näytä valinnat (monisanaisesti)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "muuta salasanaa"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "muuta luottamusastetta"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "mitätöi käyttäjätunnus"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "mitätöi toissijainen avain"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "ota avain käyttöön"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "poista avain käytöstä"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "näytä valokuvatunniste"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Salainen avain on saatavilla.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Tähän tarvitaan salainen avain.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4331,294 -3371,240 +4271,304 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Avain on mitätöity."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tuntematon allekirjoitusluokka"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Varmastiko poista tämä käyttäjätunnus? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Varmastiko poista tämä käyttäjätunnus? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Haluatko varmasti poistaa tämän avaimen? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "näytä valinnat"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Varmastiko päivitä valinnat? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Tallenna muutokset? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Lopeta tallentamatta muutoksia?"
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "arvo ei kelpaa\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "virhe: sormenjälki on väärä\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "avainta \"%s\" ei löydy: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Tiiviste: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Ominaisuudet: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notaatio: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (luottamuksellinen)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[mitätöity] "
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Tämä avain on poistettu käytöstä"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4626,20 -3612,14 +4576,20 @@@ msgstr "
"Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
"ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4647,17 -3627,14 +4597,17 @@@ msgstr "
"VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi. Tämän \n"
"komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4666,35 -3643,27 +4616,35 @@@ msgstr "
"VAROITUS: Tämä on PGP2-muodon avain. Valokuvan lisääminen voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4702,38 -3671,31 +4652,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d allekirjoitus poistettu.\n"
msgstr[1] "%d allekirjoitus poistettu.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Mitään ei poistettu.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "virheellinen ascii-koodaus"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4743,39 -3705,31 +4693,39 @@@ msgstr "
"voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4783,182 -3737,149 +4733,187 @@@
msgstr ""
"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Valitse tasan yksi käyttäjätunnus!\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ylikirjoita (k/E)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "käyttäjätunnus: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " %08lX allekirjoitti tämän %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Tämä allekirjoitus vanheni %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " %08lX allekirjoitti tämän %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " %08lX mitätöi tämän %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "salainen avain ei ole saatavilla\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
"tulevaisuuteen\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
"(käyttäjätunnus %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "virheelliset tuontivalitsimet\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "valinta %c%lu on kopio\n"
@@@ -5405,8 -4249,6 +5360,8 @@@ msgstr "
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
@@@ -5478,7 -4307,6 +5433,7 @@@ msgstr "virhe kirjoitettaessa julkisee
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5487,7 -4315,6 +5442,7 @@@ msgstr "
"Huomaa, että tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n"
"\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5495,7 -4322,6 +5450,7 @@@ msgstr "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5503,51 -4329,40 +5458,51 @@@ msgstr "
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "ei koskaan"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kriittinen allekirjoituskäytäntö: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Allekirjoituskäytäntö: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kriittinen allekirjoitusnotaatio: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5555,7 -4370,20 +5510,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d väärää allekirjoitusta\n"
msgstr[1] "%d väärää allekirjoitusta\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d väärää allekirjoitusta\n"
+ msgstr[1] "%d väärää allekirjoitusta\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
+ msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5563,41 -4391,33 +5534,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
msgstr[1] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Avainrengas"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Avaimen sormenjälki ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5707,269 -4506,221 +5678,276 @@@ msgstr "avainta \"%s\" ei löydy: %s\n
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allekirjoitettu avaimellasi %08lX %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s-salattu istuntoavain\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "salattu tuntemattomalla algoritmilla %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "julkinen avain on %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " aka \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "salattu %s-avaimella, tunnus %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "julkisen avaimen avaus epäonnistui: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "salattu %lu salasanalla\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "salattu yhdellä salasanalla\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "oletettavasti %s-salattua dataa\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
"käyttää sen sijaan salainta %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "avaus onnistui\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROITUS: salattua viestiä on muokattu!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Vanhentunut allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "allekirjoituksen varmistus vaiennetaan\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "näitä allekirjoituksia ei voi käsitellä\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " aka \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr ""
"Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " aka \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Avain saatavilla kohteessa: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[ei tiedossa]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " aka \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Allekirjoitus vanhenee %s\n"
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binääri"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "teksti"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "tuntematon "
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tuntematon julkisen avaimen algoritmi"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "allekirjoitus ei ole erillinen\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"VAROITUS: useita allekirjoituksia havaittu. Vain ensimmäisen voi "
"tarkistaa.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
@@@ -6032,67 -4772,54 +6010,67 @@@ msgstr "lukuvirhe: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "pakkaamaton"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "pakkaamaton"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "tuntematon allekirjoitusluokka"
@@@ -6611,35 -5239,32 +6589,40 @@@ msgstr "allekirjoitetun datan \"%s\" av
msgid "can't open signed data fd=%d: %s\n"
msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "avain %08lX: ei käyttäjätunnusta\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "nimetön vastaanottaja; yritän käyttää salaista avainta %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, nimetön vastaanottaja olet sinä.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "vanhaa DEK-koodaus ei tueta\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6802,7 -5399,6 +6785,7 @@@ msgstr "(Kuvausta ei annettu)\n
msgid "Is this okay? (y/N) "
msgstr "Kelpaako tämä? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "luotu avain on heikko - yritän uudestaan\n"
@@@ -6823,41 -5416,39 +6806,47 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
+
++#: g10/sig-check.c:191
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = näytä lisätietoja\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6870,7 -5461,6 +6859,7 @@@ msgstr[1] "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6882,41 -5472,34 +6871,41 @@@ msgstr[1] "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "HUOM: avain on mitätöity!"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
"\"critical bit\":istä\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VAROITUS: %%-laajennus ei onnistu (liian suuri). Käytetään "
"laajentamatonta.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6924,7 -5507,6 +6913,7 @@@ msgstr "
"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
"Käytetään laajentamatonta.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6933,43 -5515,35 +6922,43 @@@ msgstr "
"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
"Käytetään laajentamatonta.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "allekirjoitetaan:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "käytetään %s-salausta\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ohitetaan \"%s\": kopio\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7058,7 -5616,6 +7047,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
@@@ -7170,149 -5705,120 +7159,149 @@@ msgstr "yli %d merkkiä pitkiä tekstir
msgid "input line longer than %d characters\n"
msgstr "syöterivi on yli %d merkkiä pitkä\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Tuetut algoritmit:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Käytäntö: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "näytä avaimet"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7320,68 -5826,58 +7309,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "salattu %lu salasanalla\n"
msgstr[1] "salattu %lu salasanalla\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
@@@ -7389,149 -5885,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d allekirjoitusta poistettu.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "salattu %lu salasanalla\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Käytäntö: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7548,18 -6018,14 +7537,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7796,19 -6217,14 +7785,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7857,44 -6264,35 +7846,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "poista avaimet julkisten avainten renkaasta"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@@ -7902,54 -6300,43 +7891,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "muuta salasanaa"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7959,26 -6346,21 +7948,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "muuta salasanaa"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "muuta salasanaa"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Valitse mitätöinnin syy:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7986,118 -6368,94 +7975,118 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "muuta salasanaa"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "muuta salasanaa"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" on jo pakattu\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "luo uusi avainpari"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "luo uusi avainpari"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI-muotoa ei tueta"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Avaimen luonti epäonnistui: %s\n"
msgstr[1] "Avaimen luonti epäonnistui: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@@ -8118,11 -6473,9 +8107,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
@@@ -8178,12 -6520,10 +8167,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8258,9 -6583,6 +8247,9 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@@ -8447,7 -6729,6 +8436,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8491,7 -6765,6 +8480,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@@ -8755,11 -6975,9 +8744,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8788,139 -7001,108 +8777,139 @@@ msgstr "valinta %c%lu on kopio\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Kuvausta ei annettu)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "näytä salaiset avaimet"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "virheellinen varmenne"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "virheellinen varmenne"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "virheellinen varmenne"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "tuota ascii-koodattu tuloste"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "älä käytä lainkaan päätettä"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "eräajo: älä kysy mitään"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|käytä salausalgoritmia NIMI"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8931,47 -7113,38 +8920,47 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Kuvausta ei annettu)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = ohita tämä avain\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9034,7 -7195,6 +9023,7 @@@ msgstr "rev? mitätöinnin tarkistukses
msgid "error storing flags: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9063,7 -7219,6 +9052,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9077,51 -7231,41 +9066,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Allekirjoitus vanheni %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " aka \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9924,116 -7907,88 +9913,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Lopeta tallentamatta muutoksia?"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10047,91 -8002,72 +10036,91 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "käyttö: gpg [valitsimet] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rivi on liian pitkä\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "lukuvirhe: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei käsitelty"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10311,7 -8211,14 +10300,18 @@@ msgstr "\"%s\" ei ole JPEG-tiedosto\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@@ -10376,12 -8271,10 +10376,12 @@@ msgstr "etsitään \"%s\" HKP-palvelime
msgid "malloc failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10445,12 -8326,6 +10445,7 @@@ msgstr "virhe kirjoitettaessa avainrenk
msgid "error reading HTTP response for '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -10569,77 -8420,61 +10564,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10776,193 -8582,146 +10771,193 @@@ msgstr "allekirjoitus epäonnistui: %s\
msgid "error sending standard options: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|käytä salasanoissa toimintatapaa N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "verkkovirhe"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "väärä salasana"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "julkista avainta ei löydy"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -11035,27 -8778,22 +11030,27 @@@ msgstr "käytä tulostustiedostona
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "julkista avainta ei löydy"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
diff --cc po/fr.po
index 11e53ce,375ccc8..eae37f5
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -18,7 -17,6 +18,7 @@@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.5\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "impossible d'obtenir le verrou pinentry : %s\n"
@@@ -29,48 -27,39 +29,48 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|_Annuler"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|Code personnel :"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
#, fuzzy
#| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
msgstr "|pinentry-label|_Annuler"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr ""
"Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "phrase de passe incorrecte
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Qualité :"
@@@ -88,13 -76,11 +88,13 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"La qualité du texte entré ci-dessus.\n"
"Veuillez demander à votre administrateur des précisions sur les critères."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -102,7 -88,6 +102,7 @@@ msgstr "
"Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
"pendant cette session"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -110,53 -95,40 +110,53 @@@ msgstr "
"Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
"pendant cette session"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Phrase secrète :"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "ne correspond pas — veuillez réessayer"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (essai %d sur %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "Répéter :"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "Code personnel trop long"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Phrase secrète trop longue"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Caractères incorrects dans le code personnel"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "Code personnel trop court"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Mauvais code personnel"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Mauvaise phrase secrète"
@@@ -165,57 -136,35 +165,57 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, 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:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Autoriser"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Refuser"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Veuillez répéter cette phrase secrète"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -250,65 -194,51 +250,65 @@@ 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:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "échec de création du flux à partir de cette socket : %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Veuillez insérer la carte de numéro de série"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Veuillez retirer la carte présente et insérer celle de numéro de série"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Code personnel d'administration"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "CDP"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Code de réinitialisation"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AUtilisez le pavé numérique du lecteur en entrée."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Répétez ce code de réinitialisation"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Répétez ce code de déblocage personnel"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Répétez ce code personnel"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr ""
"les codes de réinitialisation ne correspondent pas ; veuillez réessayer"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr ""
"les codes de déblocage personnels ne correspondent pas ; veuillez réessayer"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "Les codes personnels ne correspondent pas ; veuillez réessayer"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Veuillez entrer le code personnel%s%s%s pour déverrouiller la carte"
@@@ -392,8 -309,6 +392,8 @@@ msgstr "Veuillez entrer la phrase secr�
msgid "Please enter the new passphrase"
msgstr "Veuillez entrer la nouvelle phrase secrète"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -401,119 -316,90 +401,123 @@@ msgstr "
"@Options :\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "exécuter en mode démon (arrière-plan)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "exécuter en mode serveur (premier plan)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "exécuter en mode serveur"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "bavard"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "sortie de commandes à la sh"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "sortie de commandes à la csh"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FICHIER|lire les options depuis le FICHIER"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "ne pas détacher de la console"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "ne pas capturer le clavier et la souris"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "utiliser un fichier journal pour le serveur"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROG|utiliser PROG pour entrer le code personnel"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROG|utiliser PROG comme SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "ne pas utiliser le SCdaemon"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|connect to host NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOM|se connecter à l'hôte NOM"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ignorer les demandes de modification du TTY"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ignorer les demandes de modification d'aff. X"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|oublier les codes personnels après N secondes"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "ne pas utiliser le cache de code pour signer"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "ne pas marquer les clefs comme de confiance"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "permettre de préconfigurer la phrase secrète"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "activer la prise en charge de SSH"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
msgstr "activer la prise en charge de putty"
@@@ -521,21 -407,14 +525,21 @@@
#. 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
"et tout problème de traduction à <traduc at traduc.org>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -543,148 -422,114 +547,153 @@@ msgstr "
"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "la fonction de hachage sélectionnée est incorrecte\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "lecture des options de « %s »\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Remarque : « %s » n'est pas considéré comme une option\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de créer la socket : %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "le nom de la socket « %s » est trop long\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
"une instance de gpg-agent fonctionne déjà —\n"
"pas de démarrage d'une nouvelle instance\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "erreur de lecture du « nonce » de la socket\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erreur de lien de la socket à « %s » : %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "échec de listen() : %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "échec de stat() pour « %s » : %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "impossible d'utiliser « %s » comme répertoire personnel\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erreur de lecture du « nonce » sur le descripteur %d : %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "gestionnaire 0x%lx pour le descripteur %d démarré\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "gestionnaire 0x%lx pour le descripteur %d terminé\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "gestionnaire SSH 0x%lx pour le descripteur %d démarré\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "gestionnaire SSH 0x%lx pour le descripteur %d terminé\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "échec de npth_pselect : %s — attente 1 s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s arrêté\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr ""
"Utilisation : gpg-preset-passphrase [options] KEYGRIP (-h pour l'aide)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -692,8 -537,6 +701,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:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -544,6 +710,9 @@@ msgstr "
"@Commandes :\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -759,8 -591,6 +768,8 @@@ msgstr "annulé\n
msgid "error while asking for the passphrase: %s\n"
msgstr "erreur de demande de la phrase secrète : %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
@@@ -820,8 -641,6 +829,8 @@@ msgstr "
msgid "Yes"
msgstr "Oui"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Non"
@@@ -877,7 -689,6 +886,7 @@@ msgstr "Modifier la phrase secrète
msgid "I'll change it later"
msgstr "Je la modifierai plus tard"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -885,11 -696,9 +894,11 @@@
"%%0A?"
msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "Supprimer la clef"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -914,7 -720,6 +923,7 @@@ msgid "a %zu bit hash is not valid for
msgstr ""
"un hachage de %1$zu bits n'est pas valable pour une clef %3$s de %2$u bits\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "échec de vérification de la signature créée : %s\n"
@@@ -953,8 -748,6 +962,8 @@@ msgstr "erreur de création d'un tube
msgid "error creating a stream for a pipe: %s\n"
msgstr "erreur de création d'un flux pour un tube : %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "erreur de création de processus fils : %s\n"
@@@ -1081,7 -848,6 +1090,7 @@@ msgstr "hors limite de la mémoire séc
msgid "out of core while allocating %lu bytes"
msgstr "hors limite lors de l'allocation de %lu octets"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
@@@ -1096,7 -860,6 +1105,7 @@@ msgstr "%s : %u : option « %s » o
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1203,8 -943,6 +1212,8 @@@ msgstr "Clef de session créée
msgid "algorithm: %s"
msgstr "algorithme : %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "algorithme non pris en charge : %s"
@@@ -1370,7 -1070,6 +1379,7 @@@ msgstr "option incorrecte
msgid "missing argument for option \"%.50s\"\n"
msgstr "argument manquant pour l'option « %.50s »\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "argument incorrect pour l'option « %.50s »\n"
@@@ -1395,7 -1090,6 +1404,7 @@@ msgstr "l'option « %.50s » est ambi
msgid "command \"%.50s\" is ambiguous\n"
msgstr "la commande « %.50s » est ambiguë\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "hors limite\n"
@@@ -1453,8 -1136,6 +1462,8 @@@ msgstr "verrou « %s » non effectif�
msgid "waiting for lock %s...\n"
msgstr "attente du verrou %s…\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@@ -1584,7 -1239,6 +1593,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "Attention : des données de notation incorrectes ont été trouvées.\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "échec de transfert de la demande %s au client\n"
@@@ -1593,35 -1246,33 +1602,42 @@@
msgid "Enter passphrase: "
msgstr "Entrez la phrase secrète : "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "erreur de création du porte-clefs « %s » : %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "Attention : "
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s ne fonctionne pas encore avec %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la carte OpenPGP n'est pas disponible : %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP nº %s détectée\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
@@@ -1629,14 -1279,9 +1645,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "le code de réinitialisation n'est plus disponible\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Quel est votre choix ? "
@@@ -1693,94 -1325,57 +1709,77 @@@ msgstr "Erreur : nom combiné trop lon
msgid "URL to retrieve public key: "
msgstr "URL pour récupérer la clef publique : "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
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:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "erreur d'écriture de « %s » : %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Données d'identification (nom du compte) : "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
- "Erreur : données d'identification trop longues (limitées à\n"
- "%d caractères).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Données DO privées : "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Erreur : DO privé trop long (limité à %d caractères).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Préférences de langue : "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Erreur : taille incorrecte de la chaîne de préférences.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Erreur : caractères incorrects dans la chaîne de préférences.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sexe ((M)asculin, (F)éminin ou espace) : "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Erreur : réponse incorrecte.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "empreinte de l'autorité de certification : "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Erreur : formatage incorrect de l'empreinte.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "opération sur la clef impossible : %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "ce n'est pas une carte OpenPGP"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr ""
"erreur de lecture des renseignements actuellement contenus\n"
"dans la clef : %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Faut-il remplacer la clef existante ? (o/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1790,58 -1385,46 +1789,58 @@@ msgstr "
" En cas d'échec de génération de la clef, veuillez vérifier les\n"
" tailles permises dans la documentation de la carte.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la clef de signature ? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la clef de chiffrement ? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr ""
"Quelle taille de clef désirez-vous pour la clef d'authentification ? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie à %u bits\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erreur de modification de taille de clef %d en %u bits : %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Faut-il faire une sauvegarde hors carte de la clef de chiffrement ? (O/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1852,169 -1435,125 +1851,169 @@@ msgstr "
" code personnel = « %s » code personnel d'admin. = « %s ».\n"
"Vous devriez les modifier avec la commande --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Veuillez sélectionner le type de clef à générer :\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Clef de signature\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Clef de chiffrement\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Clef d'authentification\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Choix incorrect.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "échec de KEYTOCARD : %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Cette commande n'est pas permise en mode %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
#| msgid "Note: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Continue? (Y/n) "
msgid "Continue? (y/N) "
msgstr "Faut-il continuer ? (O/n) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "quitter ce menu"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "afficher les commandes d'administration"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "afficher cette aide"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "afficher toutes les données disponibles"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "modifier le nom du détenteur de la carte"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "modifier l'URL pour récupérer la clef"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "récupérer la clef indiquée dans l'URL de la carte"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "modifier l'identifiant de connexion"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "modifier les préférences de langue"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "modifier le sexe du détenteur de la carte"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "modifier une empreinte d'autorité de certification"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
"inverser le paramètre obligeant à entrer le code personnel pour les\n"
"signatures"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "générer de nouvelles clefs"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "menu pour modifier ou déverrouiller le code personnel"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "vérifier le code personnel et afficher toutes les données"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "débloquer le code personnel en utilisant un code de réinitialisation"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/carte> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "La commande n'est utilisable qu'en mode administration\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Les commandes d'administration sont permises\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Les commandes d'administration ne sont pas permises\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Commande incorrecte (essayez « help »)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erreur de lecture du bloc de clef : %s\n"
@@@ -2073,36 -1600,29 +2072,36 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"utiliser d'abord l'option « --delete-secret-keys » pour la supprimer.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erreur de création de la phrase secrète : %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "impossible d'utiliser un paquet ESK symétrique en mode S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "utilisation de l'algorithme de chiffrement %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "« %s » est déjà compressé\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Attention : « %s » est un fichier vide\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "lecture de « %s »\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2110,7 -1630,16 +2109,20 @@@ msgstr "
"Attention : forcer le chiffrement symétrique %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2119,41 -1648,35 +2131,42 @@@ msgstr "
"Attention : forcer l'algorithme de compression %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forcer le chiffrement symétrique %s (%d) est en désaccord\n"
"avec les préférences du destinataire\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s chiffré pour : « %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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "impossible d'utiliser %s en mode %s.\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "données chiffrées avec %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "chiffré avec l'algorithme inconnu %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"Attention : le message a été chiffré avec une clef faible pendant le\n"
" chiffrement symétrique.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problème de gestion des paquets chiffrés\n"
@@@ -2240,36 -1746,27 +2253,36 @@@ msgstr "supprimer autant que possible d
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
msgstr " — ignoré"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "écriture de « %s »\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "clef %s : matériel de clef sur la carte — ignorée\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "il est interdit d'exporter les clefs secrètes\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clef %s : clef de type PGP 2.x — ignorée\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "Attention : rien n'a été exporté\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2338,224 -1822,177 +2351,230 @@@ msgstr "|NOM|utiliser le NOM comme cle
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "faire une signature"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "faire une signature en texte clair"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "faire une signature détachée"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "chiffrer les données"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symétrique seulement"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "déchiffrer les données (défaut)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "vérifier une signature"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "afficher les clefs"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "afficher les clefs et les signatures"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "afficher et vérifier les signatures de clefs"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "afficher les clefs et les empreintes"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "afficher les clefs secrètes"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "générer une nouvelle paire de clefs"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, 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:463
++#: g10/gpg.c:466
#, 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:466
++#: g10/gpg.c:469
#, 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:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "générer une paire de clefs complètes"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "générer un certificat de révocation"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "supprimer les clefs du porte-clefs public"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "supprimer les clefs du porte-clefs secret"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "signer rapidement une clef"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "signer rapidement une clef localement"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "signer une clef"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "signer une clef localement"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "signer ou éditer une clef"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "modifier une phrase secrète"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exporter les clefs"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exporter les clefs vers un serveur de clefs"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importer les clefs d'un serveur de clefs"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "chercher les clefs avec un serveur de clefs"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "mettre à jour les clefs depuis un serveur"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importer ou fusionner les clefs"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "afficher l'état de la carte"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "modifier les données d'une carte"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "modifier le code personnel d'une carte"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "mettre la base de confiance à jour"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "indiquer les fonctions de hachage"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "exécuter en mode serveur"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
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:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|niveau de compression N (0 désactive)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FICHIER|écrire la sortie dans le FICHIER"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ne rien modifier"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "demander avant d'écraser un fichier"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "utiliser le comportement strict d'OpenPGP"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2564,7 -2001,6 +2583,7 @@@ msgstr "
"(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2594,11 -2030,9 +2613,11 @@@ msgstr "
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2608,7 -2042,6 +2627,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:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2616,86 -2049,71 +2635,86 @@@ msgstr "
"\n"
"Algorithmes pris en charge :\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Clef publique : "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Chiffrement : "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hachage : "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Compression : "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "utilisation : %s [options] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2703,21 -2121,18 +2722,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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2725,453 -2140,342 +2744,437 @@@ msgstr "
"Attention : les droits du répertoire contenant le fichier de configuration\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "élément de configuration « %s » inconnu\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "montrer les photos d'identité en affichant les clefs"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "montrer les URL de politique en affichant les signatures"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "montrer toutes les notations en affichant les signatures"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "utiliser les notations aux normes IETF en affichant les signatures"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
"utiliser les notations fournies par l'utilisateur en affichant les signatures"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"montrer les URL des serveurs de clefs favoris en affichant les signatures"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "indiquer la validité de l'identité en affichant les clefs"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
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:1952
++#: g10/gpg.c:1957
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:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "montrer le nom du porte-clefs en affichant les clefs"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "montrer les dates d'expiration en affichant les signatures"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "mode pinentry « %s » incorrect\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "impossible d'analyser l'URL du serveur de clefs\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s : %d : options d'importation incorrectes\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "options d'importation incorrectes\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s : %d : options d'exportation incorrectes\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "options d'exportation incorrectes\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s : %d : options de liste incorrectes\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "montrer les photos d'identité en vérifiant les signatures"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "montrer les URL de politique en vérifiant les signatures"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "montrer toutes les notations en vérifiant les signatures"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
"utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
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:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "indiquer la validité de l'identité en vérifiant les signatures"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
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:3251
++#: g10/gpg.c:3250
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:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "valider les signatures avec les données PKA"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
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:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s : %d : options de vérification incorrectes\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "options de vérification incorrectes\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, 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:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Attention : %s remplace %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s.\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "Attention : exécution avec un système de temps contrefait : "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression sélectionné est incorrect\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "« completes-needed » doit être supérieur à 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "« marginals-needed » doit être supérieur à 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "préférences par défaut incorrectes\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "préférences personnelles de chiffrement incorrectes\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "préférences personnelles de hachage incorrectes\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "préférences personnelles de compression incorrectes\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
- #: 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:3863
- #, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+ #, fuzzy, c-format
+ #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
- #: g10/gpg.c:3868
- #, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+ #, fuzzy, c-format
+ #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "impossible d'utiliser l'algorithme de compression « %s » en mode %s.\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance : %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "échec du chiffrement symétrique de « %s » : %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "impossible d'utiliser --symmetric --encrypt en mode %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "échec d'envoi vers le serveur de clefs : %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "échec de réception depuis le serveur de clefs : %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "échec de recherche au sein du serveur de clefs : %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "échec de déconstruction d'une armure : %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "échec de construction d'une armure : %s \n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » incorrect\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message…\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donnée est incorrecte\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donnée est incorrecte\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
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"
@@@ -3183,7 -2485,6 +3186,7 @@@ msgstr "|FICHIER|prendre les clefs dan
msgid "make timestamp conflicts only a warning"
msgstr "convertir les conflits de date en avertissements"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|écrire l'état sur ce descripteur"
@@@ -3212,144 -2508,120 +3215,150 @@@ msgstr "Pas d'aide disponible
msgid "No help available for '%s'"
msgstr "Pas d'aide disponible pour « %s »"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "importer des signatures marquées comme locales seulement"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "réparer les données endommagées du serveur pks pendant l'importation"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "ne pas mettre à jour la base de confiance après l'importation"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "ne pas mettre à jour la base de confiance après l'importation"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "afficher l'empreinte de la clef"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "n'accepter que les mises à jour des clefs existantes"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "nettoyer les parties inutilisables de la clef après l'importation"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "supprimer autant que possible de la clef après l'importation"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "entrée supposée au format binaire"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "afficher l'empreinte de la clef"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "un bloc de type %d a été ignoré\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu clefs traitées jusqu'à présent\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Quantité totale traitée : %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " nouvelles clefs ignorées : %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nouvelles clefs ignorées : %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sans identité : %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importées : %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modifiées : %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nouvelles identités : %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nouvelles sous-clefs : %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nouvelles signatures : %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nouvelles révocations de clef : %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " clefs secrètes lues : %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " clefs secrètes importées : %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " clefs secrètes non modifiées : %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importées : %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures nettoyées : %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " identités nettoyées : %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3358,189 -2630,151 +3367,189 @@@ msgstr "
"Attention : la clef %s contient des préférences pour des\n"
" algorithmes indisponibles pour ces identités :\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de chiffrement %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de hachage %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de compression %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "vous devriez mettre à jour vos préférences et redistribuer cette\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "clef pour éviter d'éventuels problèmes d'algorithmes non appropriés\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"vous pouvez mettre à jour vos préférences avec :\n"
"gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "clef %s : pas d'identité\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "clef %s : %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "rejetée par le filtre d’importation"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clef %s : corruption de sous-clef PKS réparée\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clef %s : identité « %s » non autosignée acceptée\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clef %s : pas d'identité valable\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "cela pourrait provenir d'une autosignature manquante\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clef %s : clef publique introuvable : %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clef %s : nouvelle clef — ignorée\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "aucun porte-clefs accessible en écriture n'a été trouvé : %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clef %s : clef publique « %s » importée\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clef %s : ne correspond pas à notre copie\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clef %s : « %s » 1 nouvelle identité\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clef %s : « %s » %d nouvelles identités\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clef %s : « %s » 1 nouvelle signature\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clef %s : « %s » %d nouvelles signatures\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clef %s : « %s » %d signature nettoyée\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clef %s : « %s » %d signatures nettoyées\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clef %s : « %s » %d identité nettoyée\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clef %s : « %s » %d identités nettoyées\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clef %s : « %s » n'est pas modifiée\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clef %s : clef secrète importée\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "clef %s : la clef secrète clef existe déjà\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "clef secrète %s : %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "impossible d'importer des clefs secrètes\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
@@@ -3555,143 -2789,116 +3564,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"clef %s : pas de clef publique — impossible d'appliquer le certificat\n"
" de révocation\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clef %s : certificat de révocation incorrect : %s — rejeté\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clef %s : « %s » certificat de révocation importé\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clef %s : pas d'identité pour la signature\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "clef %s : algorithme à clef publique non géré avec l'identité « %s »\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clef %s : autosignature de l'identité « %s » incorrecte\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clef %s : algorithme à clef publique non pris en charge\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clef %s : signature directe de clef incorrecte\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clef %s : pas de sous-clef pour relier la clef\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clef %s : lien à la sous-clef incorrect\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clef %s : pas de sous-clef pour révoquer la clef\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clef %s : révocation de sous-clef incorrecte\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clef %s : suppression de la révocation de sous-clefs multiples\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clef %s : identité « %s » ignorée\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clef %s : sous-clef ignorée\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clef %s : signature non exportable (classe 0x%02X) — ignorée\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "clef %s : certificat de révocation au mauvais endroit — ignoré\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clef %s : certificat de révocation incorrect : %s — ignoré\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "clef %s : signature de sous-clef au mauvais endroit — ignorée\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "clef %s : classe de signature inattendue (0x%02X) — ignorée\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clef %s : identités en double détectées — fusionnées\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"Attention : la clef %s est peut-être révoquée :\n"
" récupération de la clef de révocation %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"Attention : la clef %s est peut-être révoquée :\n"
" la clef de révocation %s est absente.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clef %s : ajout du certificat de révocation « %s »\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clef %s : ajout de la signature directe de clef\n"
@@@ -3732,85 -2932,12 +3741,15 @@@ msgstr "erreur d'ouverture de « %s �
msgid "failed to rebuild keyring cache: %s\n"
msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[révocation]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autosignature]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "clef %s : algorithme à clef publique non pris en charge\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "Good signature from"
- msgid " (reordered signatures follow)"
- msgstr "Bonne signature de"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "key %s: %s\n"
- msgid "key %s:\n"
- msgstr "clef %s : %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Identité « %s » : %d signature supprimée\n"
- msgstr[1] "Identité « %s » : %d signature supprimée\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
- msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d mauvaises signatures\n"
- msgstr[1] "%d mauvaises signatures\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Bonne signature de"
- msgstr[1] "Bonne signature de"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3821,17 -2948,14 +3760,17 @@@ msgstr "
"vérifier les clefs des autres utilisateurs (en regardant les passeports, en\n"
"vérifiant les empreintes depuis diverses sources, etc.)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = je fais très légèrement confiance\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = je fais entièrement confiance\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3841,52 -2965,40 +3780,52 @@@ msgstr "
"Une profondeur supérieure à 1 permet à la clef que vous signez de faire\n"
"des signatures de confiance de votre part.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Veuillez entrer un domaine pour restreindre cette signature, ou appuyer\n"
"sur la touche entrée pour aucun domaine.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'identité « %s » est révoquée."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voulez-vous vraiment toujours la signer ? (o/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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Impossible de signer.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'identité « %s » est expiré."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'identité « %s » n'est pas autosignée."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'identité « %s » peut être signée. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Faut-il la signer ? (o/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3895,11 -3007,9 +3834,11 @@@ msgstr "
"L'autosignature de « %s »\n"
"est une signature de type PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Voulez-vous la modifier en autosignature OpenPGP ? (o/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3908,13 -3018,11 +3847,13 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"a expiré.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Voulez-vous créer une nouvelle signature pour remplacer celle qui a\n"
"expiré ? (o/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3923,43 -3031,34 +3862,43 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"est locale.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Voulez-vous la rendre complètement exportable ? (o/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "« %s » a déjà été signée localement par la clef %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "« %s » a déjà été signée par la clef %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voulez-vous quand même encore la signer ? (o/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Rien à signer avec la clef %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Cette clef a expiré."
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Cette clef va expirer le %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Voulez-vous que votre signature expire en même temps ? (O/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3968,31 -3067,25 +3907,31 @@@ msgstr "
"Avec quel soin avez-vous vérifié que la clef à signer appartient bien à\n"
"la personne sus-nommée ? Si vous ne savez quoi répondre, entrez « 0 ».\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Je ne répondrai pas.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Je n'ai pas vérifié du tout.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) J'ai partiellement vérifié.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) J'ai complètement vérifié.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4001,229 -3094,175 +3940,229 @@@ msgstr "
"Voulez-vous vraiment signer cette clef avec votre\n"
"clef « %s » (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Ce sera une autosignature.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "Attention : la signature ne sera pas marquée comme non exportable.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "Attention : La signature ne sera pas marquée comme non révocable.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "La signature sera marquée comme non exportable.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "La signature sera marquée comme non révocable.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Je n'ai pas du tout vérifié cette clef.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "J'ai partiellement vérifié cette clef.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "J'ai complètement vérifié cette clef.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Voulez-vous vraiment signer ? (o/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "échec de la signature : %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"La clef ne possède que des éléments partiels ou stockés sur carte\n"
"— pas de phrase secrète à modifier.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "clef %s : erreur de modification de la phrase secrète : %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "enregistrer et quitter"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "afficher l'empreinte de la clef"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Entrez le keygrip : "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "afficher la clef et les identités"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "sélectionner l'identité N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "sélectionner la sous-clef N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "vérifier les signatures"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"signer les identités sélectionnées [* voir ci-dessous les commandes "
"similaires]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "signer les identités sélectionnées localement"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "signer les identités sélectionnées avec une signature de confiance"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "signer les identités sélectionnées avec une signature non révocable"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "ajouter une identité"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "ajouter une photo d'identité"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "supprimer les identités sélectionnées"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "ajouter une sous-clef"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "ajouter une clef à une carte à puce"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "déplacer une clef vers une carte à puce"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "déplacer une clef de sauvegarde vers une carte à puce"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "supprimer les sous-clefs sélectionnées"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "ajouter une clef de révocation"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "supprimer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
"modifier la date d'expiration de la clef ou des sous-clefs sélectionnées"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "marquer l'identité sélectionnée comme principale"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "afficher les préférences (expert)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "afficher les préférences (bavard)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "définir la liste de préférences pour les identités sélectionnées"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "définir le serveur de clefs favori pour les identités sélectionnées"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "définir une notation pour les identités sélectionnées"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "modifier la phrase secrète"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "modifier la confiance du propriétaire"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "révoquer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "révoquer les identités sélectionnées"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "révoquer la clef ou des sous-clefs sélectionnées"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "activer la clef"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "désactiver la clef"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "montrer les photos d'identité sélectionnées"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"compacter les identités inutilisables et supprimer les\n"
" signatures inutilisables de la clef"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"compacter les identités inutilisables et supprimer toutes\n"
" les signatures de la clef"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "La clef secrète est disponible.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "La clef secrète est nécessaire pour faire cela.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4235,281 -3274,229 +4174,293 @@@ msgstr "
" confiance (tsign), « nr » pour les signatures non révocables\n"
" (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "La clef est révoquée."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Conseil : sélectionner les identités à signer\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Type de signature « %s » inconnu\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Cette commande n'est pas permise en mode %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Vous devez sélectionner au moins une identité.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Faut-il vraiment supprimer toutes les identités sélectionnées ? (o/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Faut-il vraiment supprimer cette identité ? (o/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Vous devez sélectionner exactement une clef.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "La commande attend un nom de fichier comme argument\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Impossible d'ouvrir « %s » : %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Erreur de lecture de la clef de sauvegarde sur « %s » : %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Vous devez sélectionner au moins une clef.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Voulez-vous vraiment supprimer cette clef ? (o/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Voulez-vous vraiment révoquer toutes les identités sélectionnées ? (o/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Voulez-vous vraiment révoquer cette identité ? (o/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Voulez-vous vraiment révoquer toute la clef ? (o/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Voulez-vous vraiment révoquer les sous-clefs sélectionnées ? (o/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Voulez-vous vraiment révoquer cette sous-clef ? (o/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"La confiance du propriétaire pourrait ne pas être définie à partir de\n"
"la base de confiance d'un tiers\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Définir la liste de préférences en :\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Faut-il vraiment mettre à jour les préférences pour les\n"
"identités sélectionnées ? (o/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Faut-il enregistrer les modifications ? (o/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Faut-il quitter sans enregistrer ? (o/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "échec de la mise à jour : %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "La clef n'a pas été modifiée donc la mise à jour est inutile.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "échec de vérification de la liste de confiance : %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "échec de vérification de la liste de confiance : %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "« %s » n’est pas une empreinte\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "« %s » n’est pas l’empreinte principale\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valeur incorrecte\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "Pas d’identités correspondantes."
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "Rien à signer.\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "'%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "\"%s\" is not a fingerprint\n"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "« %s » n’est pas une empreinte\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "clef « %s » introuvable : %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Hachage : "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Fonctionnalités : "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Serveur de clefs sans modification"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Serveur de clefs favori : "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Notations : "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Il n'y a pas de préférences dans une identité de type PGP 2.x.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "La clef suivante a été révoquée le %s par la clef %s %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Cette clef peut être révoquée par la clef %s %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(sensible)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "créé : %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "révoquée : %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "expirée : %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "expire : %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "utilisation : %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "nº de carte : "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "confiance : %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "validité : %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Cette clef a été désactivée"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4517,18 -3504,12 +4468,18 @@@ msgstr "
"Veuillez remarquer que la validité affichée pour la clef n'est pas\n"
"forcément correcte avant d'avoir relancé le programme.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "expirée"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4537,15 -3518,12 +4488,15 @@@ msgstr "
"commande\n"
" risque de rendre une autre identité principale par défaut.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4554,36 -3532,28 +4505,36 @@@ msgstr "
"Attention : c'est une clef de type PGP 2. Ajouter une photo d'identité\n"
" peut forcer certaines versions de PGP à rejeter cette clef.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "Cette identité existe déjà pour cette clef.\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Supprimer cette bonne signature ? (o/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Supprimer cette signature inconnue ? (o/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4591,20 -3561,16 +4542,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d signature supprimée.\n"
msgstr[1] "%d signature supprimée.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Rien n'a été supprimé.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "incorrecte"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identité « %s » compactée : %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4612,17 -3578,14 +4563,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Identité « %s » : %d signature supprimée\n"
msgstr[1] "Identité « %s » : %d signature supprimée\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identité « %s » : déjà minimisée\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identité « %s » : déjà nettoyée\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4631,43 -3594,35 +4582,43 @@@ msgstr "
"Attention : c'est une clef de type PGP 2.x. Ajouter un révocateur désigné\n"
" peut forcer certaines versions de PGP à rejeter cette clef.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Vous ne pouvez pas ajouter de révocateur désigné à une clef de type PGP 2."
"x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Entrez l'identité du révocateur désigné : "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"impossible d'utiliser une clef de type PGP 2.x comme révocateur désigné.\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"vous ne pouvez pas utiliser une clef comme son propre révocateur désigné\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "cette clef à déjà été désignée comme un révocateur\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"Attention : l'établissement d'une clef comme révocateur désigné\n"
" est irréversible.\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4677,178 -3632,146 +4628,184 @@@ msgid "
msgstr ""
"Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Modification de la date d'expiration d'une sous-clef.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Modification de la date d'expiration de la clef principale.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vous ne pouvez pas modifier la date d'expiration d'une clef v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "la sous-clef de signature %s a déjà une certification croisée\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"la sous-clef %s ne signe pas et n'a donc pas besoin de certification "
"croisée\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Veuillez sélectionner exactement une identité.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Entrez l'URL de votre serveur de clefs favori : "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Entrez la notation : "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Faut-il continuer ? (o/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'identité d'indice %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Pas d'identité avec le hachage %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "Pas de sous-clef d'indice %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Pas de sous-clef d'indice %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identité : « %s »\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "signée par votre clef %s le %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Cette signature a expiré le %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Voulez-vous vraiment toujours la révoquer ? (o/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
"Faut-il créer un certificat de révocation pour cette signature ? (o/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Non signée par vous.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vous avez signé ces identités sur la clef %s :\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (non révocable)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "révoquée par votre clef %s le %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "pas de clef secrète\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'identité « %s »\" est déjà révoquée.\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"Attention : une signature d'identité date de %d secondes dans le futur\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clef %s est déjà révoqué.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La sous-clef %s est déjà révoquée.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Affichage de la photo d'identité %s de taille %ld pour la clef\n"
"%s (uid %d)\n"
++#: g10/keygen.c: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/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "préférence « %s » en double\n"
@@@ -5287,8 -4133,6 +5244,8 @@@ msgstr "
"pendant la génération de nombres premiers ; cela donne au générateur de\n"
"nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Échec de génération de la clef : %s\n"
@@@ -5361,7 -4192,6 +5318,7 @@@ msgstr "erreur d'écriture du porte-cle
msgid "public and secret key created and signed.\n"
msgstr "les clefs publique et secrète ont été créées et signées.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5370,7 -4200,6 +5327,7 @@@ msgstr "
"pouvez\n"
"utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5378,7 -4207,6 +5335,7 @@@ msgstr "
"la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
"problème d'horloge)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5386,50 -4214,39 +5343,50 @@@ msgstr "
"la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
"problème d'horloge)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"Remarque : la création de sous-clefs pour des clefs v3 n'est pas compatible\n"
" avec OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secrètes de la clef principale ne sont pas disponibles.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr ""
"Les parties secrètes de la clef principale sont stockées sur la carte.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Faut-il vraiment la créer ? (o/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "jamais "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politique de signature critique : "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politique de signature : "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Serveur de clefs critique favori : "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Notation de signature critique : "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Notation de signature : "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5437,7 -4254,20 +5394,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d mauvaises signatures\n"
msgstr[1] "%d mauvaises signatures\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d mauvaises signatures\n"
+ msgstr[1] "%d mauvaises signatures\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
+ msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5445,7 -4275,6 +5418,7 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signature non vérifiée à cause d'une erreur\n"
msgstr[1] "1 signature non vérifiée à cause d'une erreur\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
@@@ -5453,33 -4282,26 +5426,33 @@@ msgid_plural "Warning: %lu keys skippe
msgstr[0] "Attention : %lu clefs ignorées en raison de leur grande taille\n"
msgstr[1] "Attention : %lu clefs ignorées en raison de leur grande taille\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Porte-clefs"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Empreinte de clef principale :"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Empreinte de la sous-clef :"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Empreinte clef princip. :"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Empreinte de sous-clef :"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Empreinte de la clef ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Nº de série de carte ="
@@@ -5593,262 -4394,214 +5566,269 @@@ msgstr "clef introuvable sur le serveu
msgid "no keyserver known (use option --keyserver)\n"
msgstr "pas de serveur de clefs connu (utilisez l'option --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "demande de la clef %s sur le serveur %s %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "requête de la clef %s sur %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "pas d'action pour le serveur de clefs.\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "« %s » a été ignorée : %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "envoi de la clef %s à %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "requête de la clef sur « %s »\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "taille étonnante pour une clef de session chiffrée (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "clef de session chiffrée %s\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "phrase secrète générée avec l'algorithme de hachage %d inconnu\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "la clef publique est %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr ""
"données chiffrées par clef publique : bonne clef de chiffrement (DEK)\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"chiffré avec une clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " « %s »\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "chiffré avec une clef %s, identifiant %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "échec du déchiffrement par clef publique : %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "chiffré avec %lu phrases secrètes\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "chiffré avec 1 phrase secrète\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "les données sont supposées chiffrées avec %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"L'algorithme IDEA n'est pas disponible, essai avec %s\n"
"qui fonctionnera peut-être avec un peu de chance\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "Attention : l'intégrité du message n'était pas protégée\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "le déchiffrement a réussi\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Attention : le message chiffré a été manipulé.\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "échec du déchiffrement : %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Remarque : l'expéditeur a demandé « à votre seule attention »\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom de fichier original : « %.*s »\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Attention : plusieurs textes en clair ont été vus\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "aucune signature trouvée\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "MAUVAISE signature de « %s »"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature expirée de « %s »"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Bonne signature de « %s »"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "vérification de signature supprimée\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "impossible de traiter ces données ambiguës de signature\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Signature faite le %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " avec la clef %s %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signature faite le %s avec la clef %s d'identifiant %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " alias « %s »"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Clef disponible sur : "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[doute]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " alias « %s »"
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "Attention : cette clef n'est pas certifiée avec une signature de confiance.\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "La signature a expiré le %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "La signature expire le %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signature %s, algorithme de hachage %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binaire"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "mode texte"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "inconnu"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr ", algorithme de clef "
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de vérifier la signature : %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "la signature n'est pas détachée\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"Attention : plusieurs signatures ont été détectées.\n"
" Seule la première sera vérifiée.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signature autonome de classe 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien type (PGP 2.x)\n"
@@@ -5911,34 -4653,28 +5891,34 @@@ msgstr "erreur de lecture dans « %s
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s : %d : option « %s » déconseillée\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Attention : « %s » est une option déconseillée\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "veuillez plutôt utiliser « %s%s »\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5946,37 -4682,30 +5926,37 @@@ msgstr "
"Attention : « %s%s » est une option obsolète — non prise en compte à part "
"dans %s\n"
- #: g10/misc.c:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Non compressé"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "non compressé|non|sans"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "option « %s » ambiguë\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
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:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type '%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6504,38 -5134,36 +6484,44 @@@ msgstr "impossible d'ouvrir les donnée
msgid "can't open signed data fd=%d: %s\n"
msgstr "impossible d'ouvrir les données signées fd=%d : %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinataire anonyme ; essai avec clef secrète %s…\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "d'accord, nous sommes le destinataire anonyme.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr ""
"l'ancien encodage de la clef de chiffrement (DEK) n'est pas pris en charge\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "l'algorithme de chiffrement %d%s est inconnu ou désactivé\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"Attention : l'algorithme de chiffrement %s est introuvable\n"
" dans les préférences du destinataire\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Remarque : la clef secrète %s a expiré le %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "Remarque : la clef a été révoquée"
@@@ -6715,7 -5315,6 +6701,7 @@@ msgstr "(Aucune description donnée)\n
msgid "Is this okay? (y/N) "
msgstr "Est-ce d'accord ? (o/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "clef faible générée — nouvel essai\n"
@@@ -6737,28 -5333,28 +6723,34 @@@ msgid "%s key %s requires a %zu bit or
msgstr ""
"la clef %s %s nécessite un hachage d'au moins %zu bits (le hachage est %s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "Attention : conflit de hachage de signature dans le message\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "impossible d'utiliser %s en mode %s.\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"Attention : la sous-clef de signature %s n'a pas de certificat croisé\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "veuillez consulter %s pour plus de renseignements\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"Attention : la sous-clef de signature %s a un certificat croisé incorrect\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6768,7 -5364,6 +6760,7 @@@ msgstr[0] "
msgstr[1] ""
"la clef publique %s est plus récente de %lu seconde que la signature\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6778,7 -5373,6 +6770,7 @@@ msgstr[0] "
msgstr[1] ""
"la clef publique %s est plus récente de %lu seconde que la signature\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6793,7 -5387,6 +6785,7 @@@ msgstr[1] "
"la clef %s a été créée %lu seconde dans le futur\n"
"(faille temporelle ou problème d'horloge)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6807,35 -5400,29 +6799,35 @@@ msgstr[1] "
"la clef %s a été créée %lu seconde dans le futur\n"
"(faille temporelle ou problème d'horloge)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Remarque : la clef de signature %s a expiré le %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Remarque : la clef de signature %s a été révoquée\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"la signature de la clef %s est supposée être fausse car un bit\n"
"critique est inconnu\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"clef %s : pas de sous-clef pour la signature de révocation de sous-clef\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "clef %s : pas de sous-clef pour la signature de lien à la sous-clef\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
@@@ -6843,7 -5430,6 +6835,7 @@@
" la notation (chaîne trop grande).\n"
" Utilisation de la version non expansée.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6852,7 -5438,6 +6844,7 @@@ msgstr "
" l'URL de politique (chaîne trop grande).\n"
" Utilisation de la version non expansée.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6862,12 -5447,10 +6854,12 @@@ msgstr "
" l'URL du serveur de clef favori (chaîne trop grande).\n"
" Utilisation de la version non expansée.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signature de : « %s »\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6875,31 -5458,25 +6867,31 @@@ msgstr "
"Attention : forcer l'algorithme de hachage %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "signature :"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "le chiffrement %s sera utilisé\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "« %s » a été ignorée : en double\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "ignoré : clef secrète déjà présente\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"c'est une clef Elgamal générée par PGP qui n'est pas sûre pour les "
@@@ -6985,7 -5546,6 +6977,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "impossible d'accéder à « %s » : %s\n"
@@@ -7094,149 -5632,121 +7086,149 @@@ msgstr "impossible de traiter les ligne
msgid "input line longer than %d characters\n"
msgstr "la ligne d'entrée est plus longue que %d caractères\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erreur d'envoi d'options standards : %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algorithme non pris en charge : %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "erreur de création du fichier temporaire : %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erreur d'écriture en encodage base64 : %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validité : %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, 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:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "afficher les clefs"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7244,7 -5754,6 +7236,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7252,7 -5761,6 +7244,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:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7260,7 -5768,6 +7252,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:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7268,54 -5775,46 +7260,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7324,108 -5823,90 +7316,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, 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:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, 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:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d signatures supprimées\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7433,13 -5914,11 +7425,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "chiffré avec %lu phrases secrètes\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7447,31 -5926,25 +7439,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "validité : %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7488,19 -5961,15 +7480,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, 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:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7747,19 -6171,14 +7739,19 @@@ msgstr "
"Syntaxe : kbxutil [options] [fichiers]\n"
"Afficher, exporter, importer les données de trousseau local\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "le module RSA est manquant ou sa taille n'est pas de %d bits\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "l'exposant public RSA est manquant ou plus grand que %d bits\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "le rappel du code personnel a renvoyé une erreur : %s\n"
@@@ -7816,44 -6226,35 +7808,44 @@@ msgstr "
"|P|Veuillez entrer le code de déblocage personnel (CDP) pour permettre à la "
"clef de créer des signatures qualifiées."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "erreur de lecture du nouveau code personnel : %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "impossible de stocker l'empreinte : %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "impossible de stocker la date de création : %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "erreur de récupération de l'état CHV de la carte\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "la réponse ne contient pas le module RSA\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "la réponse ne contient pas l'exposant public RSA\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the EC public point\n"
msgid "response does not contain the EC public key\n"
msgstr "la réponse ne contient pas le point public EC\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "la réponse ne contient pas les données de clef publique\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "échec de lecture de clef publique : %s\n"
@@@ -7861,59 -6262,48 +7853,59 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "utilisation du code personnel par défaut en tant que %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"impossible d'utiliser le code personnel par défaut en tant que %s :\n"
"%s — désactivation de la prochaine utilisation par défaut\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Veuillez entrer le code personnel"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
"le code personnel pour CHV%d est trop court ; la taille minimale\n"
"est %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "échec de vérification CHV%d : %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "la carte est irrémédiablement bloquée.\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7928,23 -6318,18 +7920,23 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Veuillez entrer le code personnel d'administration"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "l'accès aux commandes d'administration n'est pas configuré\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Veuillez entrer le code personnel"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7954,83 -6339,65 +7946,83 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Nouveau code de réinitialisation"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Nouveau code personnel d'administration"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Nouveau code personnel"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr ""
"||Veuillez entrer le code personnel d'administration et le nouveau code "
"personnel d'administration"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "erreur de lecture des données d'application\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "erreur de lecture de l'empreinte DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "la clef existe déjà\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "la clef existante sera remplacée\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "génération d'une nouvelle clef\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "écriture d'une nouvelle clef\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "la date de création est manquant\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
"le nombre premier RSA %s est manquant ou sa taille n'est pas de\n"
"%d bits\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "impossible de stocker la clef : %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI non pris en charge"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "veuillez patienter pendant la génération de la clef…\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "échec de génération de la clef\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -8038,32 -6405,26 +8030,32 @@@ msgid_plural "key generation completed
msgstr[0] "la génération de clef est terminé (%d secondes)\n"
msgstr[1] "la génération de clef est terminé (%d secondes)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "l'empreinte de la carte ne correspond pas à celle demandée\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signatures créées jusqu'à présent : %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"la vérification du code personnel d'administration est actuellement\n"
"interdite avec cette commande\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
@@@ -8085,11 -6443,9 +8077,11 @@@ msgstr "|N|Nouveau code personnel initi
msgid "run in multi server mode (foreground)"
msgstr "exécuter en mode multiserveur (premier plan)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FICHIER|écrire un journal dans le FICHIER"
@@@ -8143,12 -6488,10 +8135,12 @@@ msgstr "
"veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
"en arrière-plan\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "gestionnaire pour le descripteur %d démarré\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "gestionnaire pour le descripteur %d terminé\n"
@@@ -8223,9 -6551,6 +8215,9 @@@ msgstr "nombre de certificats correspon
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "échec de recherche de clef seulement dans le cache du dirmngr : %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "impossible d'allouer la gestion de base de clefs\n"
@@@ -8405,7 -6690,6 +8397,7 @@@ msgid "a %u bit hash is not valid for
msgstr ""
"un hachage de %1$u bits n'est pas valable pour une clef %3$s de %2$u bits\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(c'est l'algorithme MD2)\n"
@@@ -8451,7 -6728,6 +8443,7 @@@ msgstr "
"aucune utilisation de clef indiquée — toutes les utilisations sont "
"supposées\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "erreur de lecture des renseignements d'utilisation de clef : %s\n"
@@@ -8711,11 -6934,9 +8703,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr "problème de ressources : hors limite\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(c'est l'algorithme RC2)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(ça ne ressemble pas à un message chiffré)\n"
@@@ -8744,127 -6960,96 +8736,127 @@@ msgstr "certificat « %s » supprimé
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "échec de suppression du certificat « %s » : %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "aucune destinataire valable donnée\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "afficher les clefs externes"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "afficher la chaîne de certificats"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "importer les certificats"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "exporter les certificats"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "enregistrer une carte à puce"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "passer une commande au dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "appeler gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "créer une sortie encodée en base-64"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "entrée supposée au format PEM"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "entrée supposée au format base-64"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "entrée supposée au format binaire"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "ne pas consulter liste de révocations de cert."
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "vérifier la validité avec OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|nombre de certificats à inclure"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "ne pas vérifier les politiques de certificat"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "récupérer certificats d'émetteur manquants"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "ne pas utiliser du tout le terminal"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FICHIER|écrire un journal serveur dans le FICHIER"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "mode automatique : aucune question"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "oui comme réponse à la plupart des questions"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "non comme réponse à la plupart des questions"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de hachage NOM"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8874,46 -7059,37 +8866,46 @@@ msgstr "
"Signer, vérifier, chiffrer ou déchiffrer en utilisant le protocole S/MIME\n"
"L'opération par défaut dépend des données entrées\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Remarque : ne sera pas capable de chiffrer à « %s » : %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "modèle de validation « %s » inconnu\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s : %u : aucun nom d'hôte donné\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s : %u : mot de passe donné sans utilisateur\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s : %u : ignorer cette ligne\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "impossible d'analyser le serveur de clefs\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importation des certificats commun « %s »\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossible de signer en utilisant « %s » : %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@@ -8974,7 -7138,6 +8966,7 @@@ msgstr "problème de nouvelle recherch
msgid "error storing flags: %s\n"
msgstr "erreur de stockage des options : %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Erreur — "
@@@ -9012,7 -7171,6 +9004,7 @@@ msgstr "
"\n"
"%s%sVoulez-vous vraiment faire cela ?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9032,52 -7189,42 +9024,52 @@@ msgstr "
"« %s »\n"
"Remarquez que ce certificat ne va pas créer de signature qualifiée."
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"l'algorithme de hachage %d (%s) pour le signataire %d n'est pas pris en "
"charge ; utilisation de %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "algorithme de hachage utilisé pour le signataire %d : %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "échec de vérification de certificat qualifié : %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Signature faite le "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[date non donnée]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " en utilisant le certificat d'identifiant 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"signature incorrecte : l'attribut de hachage du message ne correspond pas à "
"celui calculé\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Bonne signature de"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " alias"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "C'est une signature qualifiée\n"
@@@ -9903,120 -7889,92 +9895,120 @@@ msgstr "nom de fichier absolu attendu\n
msgid "looking up '%s'\n"
msgstr "recherche de « %s »\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "afficher le contenu du cache de la liste de révocations de certificat"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr ""
"|FICHIER|charger la liste de révocations de certificat du FICHIER dans le "
"cache"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|récupérer une liste de révocations de certificat d'une URL"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "arrêter le dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "vider le 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
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "exécuter sans demander à l'utilisateur"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "permettre l'envoi de requêtes OCSP"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "interdire l'utilisation d'HTTP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "interdire l'utilisation de LDAP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"HTTP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"LDAP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignorer les URL de service OCSP contenues dans le certificat"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
"ajouter les nouveaux serveurs découverts dans les points de distribution de "
"liste de révocations de certificat à la liste de serveurs"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|utiliser le répondeur OCSP à l'URL"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|EMPR|réponse OCSP signée par EMPR"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|ne pas renvoyer plus de N éléments dans une requête"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FICHIER|utiliser les certificats de CA dans FICHIER pour HKP par TLS"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -10026,11 -7984,9 +10018,11 @@@ msgstr "
"(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -10039,79 -7995,62 +10031,79 @@@ msgstr "
"Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
"@GNUPG@\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "les niveaux de débogage possibles sont : %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "utilisation : %s [options] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "les deux-points ne sont pas permis dans le nom de socket\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr ""
"échec de récupération de liste de révocations de certificat sur « %s » : %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr ""
"échec du traitement de liste de révocations de certificat sur « %s » : %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s : %u : ligne trop longue — ignorée\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s : %u : empreinte incorrecte détectée\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s : %u : erreur de lecture : %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s : %u : fin de ligne inutile ignorée\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "SIGHUP reçu — relecture de la configuration et vidage des caches\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 reçu — aucune action définie\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM reçu — arrêt…\n"
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM reçu — encore %d connexions actives\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "arrêt forcé\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT reçu — arrêt immédiat\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "signal %d reçu — aucune action définie\n"
@@@ -10281,7 -8184,14 +10273,18 @@@ msgstr "« %s » n'est pas une URL LD
msgid "'%s' is an invalid LDAP URL\n"
msgstr "« %s » est une URL LDAP incorrecte\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "erreur d'accès à « %s » : état HTTP %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "erreur d'affichage de ligne du journal : %s\n"
@@@ -10347,12 -8245,10 +10350,12 @@@ msgstr "ajout de « %s : %d » à l
msgid "malloc failed: %s\n"
msgstr "échec de malloc : %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch : motif « %s » incorrect\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search a atteint la taille limite du serveur\n"
@@@ -10414,12 -8298,6 +10417,7 @@@ msgstr "erreur de connexion à « %s
msgid "error reading HTTP response for '%s': %s\n"
msgstr "erreur de lecture de réponse HTTP pour « %s » : %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "erreur d'accès à « %s » : état HTTP %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "erreur d'analyse de réponse OCSP pour « %s » : %s\n"
@@@ -10534,76 -8388,60 +10532,76 @@@ msgstr "le répondeur OCSP a renvoyé u
msgid "OCSP responder returned an too old status\n"
msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "échec d'assuan_inquire(%s) : %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "ldapserver manquant"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "serialno manquant dans l'identifiant de certificat"
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "échec d'assuan_inquire : %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "échec de fetch_cert_by_url : %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "échec de start_cert_fetch : %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "échec de fetch_next_cert : %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d dépassé\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossible d'allouer une structure de contrôle : %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "échec d'allocation du contexte Assuan : %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "impossible d'initialiser le serveur : %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "impossible d'enregistrer les commandes avec Assuan : %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problème d'accept_assuan : %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "problème de traitement Assuan : %s\n"
@@@ -10739,203 -8548,156 +10737,203 @@@ msgstr "échec d'envoi de ligne : %s\n
msgid "error sending standard options: %s\n"
msgstr "erreur d'envoi d'options standards : %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Options contrôlant la sortie de diagnostique"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Options contrôlant la 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Options pratiques pour le débogage"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Options contrôlant la sécurité"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|oublier les clefs SSH après N secondes"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|définir la durée maximale du cache de code personnel à N secondes"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Options d'application d'une politique de phrase secrète"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "pas de contournement de politique de phrase secrète"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|définir la taille minimale des nouvelles phrases secrètes à N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
"|N|nécessiter au moins N caractères non alphabétiques pour les nouvelles "
"phrases secrètes"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
"|FICHIER|vérifier la nouvelle phrase secrète par rapport aux motifs du "
"FICHIER"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|la phrase secrète expire après N jours"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set LDAP timeout to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOM|chiffrer aussi pour l'identité NOM"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|configurer les alias d'adresse"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Configuration pour les serveurs de clefs"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|utiliser le serveur de clefs à l'URL"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "permettre les recherches PKA (requêtes DNS)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MÉCANISMES|utiliser les MÉCANISMES pour localiser les clefs"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "désactiver tous les accès au dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOM|utiliser l’encodage NOM pour les phrases secrète PKCS#12"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "ne pas vérifier les listes de révocations de certificat racine"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Options contrôlant le format de sortie"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Options contrôlant l'interactivité et la mise en application"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Options contrôlant la sécurité"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Configuration pour les serveurs HTTP"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Configuration des serveurs LDAP à utiliser"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "liste de serveurs LDAP"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Configuration pour OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
#, fuzzy
#| msgid "GPG for OpenPGP"
msgid "OpenPGP"
msgstr "GPG pour OpenPGP"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
#, fuzzy
#| msgid "Smartcard Daemon"
msgid "Smartcards"
msgstr "Démon de carte à puce"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
#, fuzzy
#| msgid "GPG for S/MIME"
msgid "S/MIME"
msgstr "GPG pour S/MIME"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "erreur de réseau"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "PIN and Passphrase Entry"
msgid "Passphrase Entry"
msgstr "Entrée de code personnel et de phrase secrète"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "Composant non convenable pour le lancement"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Échec de vérification externe du composant %s"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing '%s': %s\n"
msgid "error closing '%s'\n"
msgstr "erreur de fermeture de « %s » : %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error hashing '%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -11009,11 -8755,9 +11007,11 @@@ msgstr "utiliser comme fichier de sorti
msgid "activate changes at runtime, if possible"
msgstr "activer modif. pendant l'exécution si possible"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -11021,15 -8765,12 +11019,15 @@@ msgstr "
"Syntaxe : @GPGCONF@ [options]\n"
"Gérer les options de configuration pour les outils du système @GNUPG@\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Un argument de composant nécessaire"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Composant introuvable"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Aucun argument permis"
diff --cc po/gl.po
index 086a98e,6f2790e..f13a74b
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -15,7 -14,6 +15,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@@ -26,41 -24,32 +26,41 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to create a sign and encrypt key? "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "¿Seguro que quere crear unha chave para asinar e cifrar? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -68,7 -57,6 +68,7 @@@ msgstr "contrasinal incorrecto
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -78,75 -66,59 +78,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "contrasinal erróneo"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "liña longa de máis\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "contrasinal demasiado longo\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Caracter non válido no nome\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "MPI erróneo"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "contrasinal erróneo"
@@@ -156,153 -127,112 +156,153 @@@
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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: fallo ao crear unha táboa hash: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
#, fuzzy
msgid "Admin PIN"
msgstr "Introduza o ID de usuario: "
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repita o contrasinal: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Repita o contrasinal: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita o contrasinal: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -381,8 -298,6 +381,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -392,124 -307,95 +392,128 @@@ msgstr "
"Opcións:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "A chave é obsoleta"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "lareto"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser un pouquiño máis calado"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "buscar chaves nun servidor de chaves"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualiza-la base de datos de confianza"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non está soportado"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -518,181 -404,138 +522,186 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Por favor, informe dos erros no programa a <gnupg-bugs at gnu.org>,\n"
"e dos erros na traducción a <proxecto at trasno.net>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "o algoritmo de resumo seleccionado non é válido\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Revocación de certificado válida"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non está dispoñible nesta sesión\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "a actualización fallou: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: non foi posible crear un directorio: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "o segredo da actualización fallou: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -543,6 +709,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -756,8 -588,6 +765,8 @@@ msgstr "Cancelar
msgid "error while asking for the passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -816,8 -637,6 +825,8 @@@ msgstr "
msgid "Yes"
msgstr "si|sim"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -868,19 -680,16 +877,19 @@@ msgstr "cambia-lo contrasinal
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "habilitar unha chave"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -900,7 -706,6 +909,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "fallou a comprobación da sinatura creada: %s\n"
@@@ -941,8 -736,6 +950,8 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -1070,7 -837,6 +1079,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@@ -1085,7 -849,6 +1094,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1202,8 -942,6 +1211,8 @@@ msgstr "%s: chaveiro creado\n
msgid "algorithm: %s"
msgstr "armadura: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1397,7 -1097,6 +1406,7 @@@ msgstr "opcións de importación non v�
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "opcións de importación non válidas\n"
@@@ -1422,7 -1117,6 +1431,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "non procesado"
@@@ -1481,8 -1164,6 +1490,8 @@@ msgstr "non se atopou a chave pública
msgid "waiting for lock %s...\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1615,7 -1270,6 +1624,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: atopáronse datos de notación non válidos\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, fuzzy, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "erro ao pór '%s' na base de datos de confianza: %s\n"
@@@ -1624,35 -1277,33 +1633,42 @@@
msgid "Enter passphrase: "
msgstr "Introduza o contrasinal: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "¡%s aínda non traballa con %s!\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "a chave secreta non está dispoñible"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
@@@ -1662,15 -1312,10 +1678,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Non se admite este comando no modo %s.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "hai partes da chave secreta non dispoñibles\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "¿A súa selección? "
@@@ -1732,154 -1364,107 +1748,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "non hai unha chave pública correspondente: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "preferencias actualizadas"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "caracter non válido na cadea de preferencias\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter non válido na cadea de preferencias\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "erro: pegada dactilar non válida\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "Pegada dactilar:"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "erro: pegada dactilar non válida\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "A xeración da chave fallou: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "non se atoparon datos OpenPGP válidos.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "¿Qué tamaño de chave quere? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "¿Qué tamaño de chave quere? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "¿Qué tamaño de chave quere? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeado a %u bits\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "omítese: a chave secreta xa está presente\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1887,179 -1472,135 +1888,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (só cifrar)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Selección non válida.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Por favor, escolla o motivo da revocación:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "a actualización fallou: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Non se admite este comando no modo %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "omítese: a chave secreta xa está presente\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "¿Asinar de verdade? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "saír deste menú"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "amosar esta axuda"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Chave dispoñible en: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "cambia-la fecha de expiración"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "cambia-la confianza sobre o dono"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "amosar fingerprint"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "xerar un novo par de chaves"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Comando incorrecto (tente \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
@@@ -2122,46 -1651,46 +2123,57 @@@ msgstr "¡hai unha chave secreta para
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "empregue a opción \"--delete-secret-keys\" para borrala primeiro.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "non se pode empregar un paquete simétrico ESK debido ao modo S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "fallou a sinatura: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' xa está comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVISO: `%s' é un ficheiro baleiro\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lendo de `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2170,38 -1699,32 +2182,39 @@@ msgstr "
"forza-lo algoritmo de compresión %s (%d) viola as preferencias do "
"destinatario\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados con %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado cun algoritmo descoñecido %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado simétrico.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problema ao manexa-lo paquete cifrado\n"
@@@ -2292,40 -1798,31 +2305,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "escribindo a `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2395,235 -1879,187 +2408,240 @@@ msgstr "|NOME|empregar NOME coma chave
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opcións de importación non válidas\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "cifrar datos"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "cifrar só con cifrado simétrico"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verificar unha sinatura"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "ve-la lista de chaves"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "ve-la lista de chaves e sinaturas"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocación"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro público"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exportar chaves a un servidor de chaves"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importar chaves dun servidor de chaves"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "buscar chaves nun servidor de chaves"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "actualizar tódalas chaves dun servidor de chaves"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "crear saída con armadura en ascii"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, 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:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "usar modo de texto canónico"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "non facer ningún cambio"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2631,7 -2067,6 +2649,7 @@@ msgstr "
"@\n"
"(Vexa a páxina man para un listado completo de comandos e opcións)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2661,13 -2096,11 +2679,13 @@@ msgstr "
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2682,7 -2115,6 +2700,7 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operación por defecto depende dos datos de entrada\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2690,548 -2122,417 +2708,530 @@@ msgstr "
"\n"
"Algoritmos soportados:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Pública: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Compresión: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opcións] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr " creouse un novo ficheiro de configuración `%s'\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro está unha chave listada"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario por defecto `%s' descoñecido\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de hash non válido `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, 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:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcións de importación non válidas\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "opcións de importación non válidas\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opcións de importación non válidas\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opcións de exportación non válidas\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, 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:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "opcións de importación non válidas\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non é un xogo de caracteres válido\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non é un xogo de caracteres válido\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non é un xogo de caracteres válido\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, 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:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, 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:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "¡%s non se admite con %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "¡%s non ten sentido empregándoo con %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non é válido\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non é válido\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
#, 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:3749
++#: g10/gpg.c:3754
#, 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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non válidas\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non válidas\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non válidas\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresión personais non válidas\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "¡%s aínda non traballa con %s!\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, 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:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o envío ao servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepción do servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportación da chave fallou: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualización no servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido poñe-la armadura: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a súa mensaxe ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
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:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@@ -3245,7 -2544,6 +3245,7 @@@ msgstr "toma-las chaves deste chaveiro
msgid "make timestamp conflicts only a warning"
msgstr "converte-los conflictos de selo de data nun aviso"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|DF|escribi-la información de estado a este DF"
@@@ -3276,336 -2569,273 +3276,341 @@@ msgstr "Non hai axuda dispoñible
msgid "No help available for '%s'"
msgstr "Non hai axuda dispoñible para `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "amosar fingerprint"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta non utilizable"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "amosar fingerprint"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "pasando por alto un bloque de tipo %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves procesadas hasta polo momento\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Número total procesado: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin IDs de usuario: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de usuario: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas sub-chaves: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revocacións de chaves: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chaves secretas importadas: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chaves secretas sin cambios: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importadas: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "omítese `%s': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: arranxouse a corrupción da sub-chave HKP\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: non hai IDs de usuario válidos\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave pública non atopada: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: nova chave - omitida\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave pública \"%s\" importada\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: non coincide coa nosa copia\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr ""
"chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
"%s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr ""
"chave %08lX: non foi posible le-lo bloque de chaves original:\n"
"%s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" sen cambios\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "omítese: a chave secreta xa está presente\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n"
@@@ -3620,148 -2850,121 +3625,148 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: non hai chave pública - non se pode aplica-lo\n"
"certificado de revocación\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr ""
"chave %08lX: certificado de revocación incorrecto:\n"
"%s - rechazado\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revocación importado\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s"
"\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chave %08lX: eliminouse unha ligazón de sub-chave múltiple\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chave %08lX: non hai unha sub-chave para a revocación da chave\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revocación de sub-chave non válida\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chave %08lX: eliminouse a revocación de sub-chaves múltiples\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: omitido o ID de usuario '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: omitida a sub-chave\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revocación no lugar erróneo - omitido\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revocación incorrecto: %s - omitido\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocación "
"%08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX "
"ausente.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@@ -3803,79 -2999,12 +3808,15 @@@ msgstr "erro lendo `%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocación]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[auto-sinatura]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "Sinatura %s, algoritmo de resumo %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Sinatura correcta de \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "omítese `%s': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "O ID de usuario \"%s\" está revocado."
- msgstr[1] "O ID de usuario \"%s\" está revocado."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
- msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d sinaturas erróneas\n"
- msgstr[1] "%d sinaturas erróneas\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Sinatura correcta de \""
- msgstr[1] "Sinatura correcta de \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3887,68 -3016,53 +3828,68 @@@ msgstr "
"correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
"comprobando pegadas dactilares de varias fontes...).\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Confío marxinalmente\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Confío totalmente\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "O ID de usuario \"%s\" está revocado."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "¿Está seguro de que quere asinalo? (s/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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Non se puido asinar.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "O ID de usuario \"%s\" está caducado."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "¿Asinar de verdade? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3957,11 -3071,9 +3898,11 @@@ msgstr "
"A auto-sinatura de \"%s\"\n"
"é unha sinatura tipo PGP 2.x\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "¿Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3970,11 -3082,9 +3911,11 @@@ msgstr "
"A súa sinatura actual en \"%s\"\n"
"caducou.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "¿Quere emitir unha nova sinatura que substitúa á caducada? (s/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3983,43 -3093,34 +3924,43 @@@ msgstr "
"A súa sinatura actual en \"%s\"\n"
"é unha sinatura local.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "¿Quere promovela a sinatura totalmente exportable? (s/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "¿Quere asinalo outra vez de tódolos xeitos? (s/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "¡Esta chave caducou!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave ha caducar o %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "¿Quere que a súa sinatura caduque ao mesmo tempo? (S/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4028,32 -3129,26 +3969,32 @@@ msgstr "
"¿Con canto tino comprobou que a chave que vai asinar realmente pertence á\n"
"persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Non hei respostar.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non o comprobei en absoluto.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Fixen algunhas comprobacións.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Fixen comprobacións moi exhaustivas.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "¿A súa elección? (introduza '?' para ter máis información): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4062,271 -3157,217 +4003,271 @@@ msgstr "
"¿Esta seguro de que quere asinar esta chave\n"
"coa súa chave: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Esta ha ser unha auto-sinatura.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"AVISO: a sinatura non se ha marcar coma non exportable.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"AVISO: A sinatura non se ha marcar coma non revocable.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non exportable.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non se comprobou esta chave en absoluto.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Comprobouse esta chave de xeito informal.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Comprobouse esta chave con moito tino.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "¿Asinar de verdade? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "gardar e saír"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "amosar fingerprint"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Notación de sinaturas: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "listar chave e IDs de usuario"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "revocar sinaturas"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "asina-la chave localmente"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "engadir un ID de usuario"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "engadir unha identificación fotográfica"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "borrar un ID de usuario"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "borrar unha chave secundaria"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "engadir unha chave de revocación"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marcar un ID de usuario coma primario"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "lista-las preferencias (expertos)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "lista-las preferencias (moitos datos)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "cambia-la confianza sobre o dono"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar un ID de usuario"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revocar unha chave secundaria"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "habilitar unha chave"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "deshabilitar unha chave"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "amosa-la identificación fotográfica"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "A chave secreta está disponible.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Cómpre a chave secreta para facer isto.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4334,296 -3375,242 +4275,306 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "A chave está revocada."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "clase de sinatura descoñecida"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Non se admite este comando no modo %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar alomenos un ID de usuario.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "¡Non pode borra-lo último ID de usuario!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "¿Seguro de que quere borrar este ID de usuario? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "¿Seguro de que quere borrar este ID de usuario? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "¿Seguro de que quere borrar esta chave? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "¿Seguro de que quere revocar este ID de usuario? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "¿Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "¿Realmente quere revoca-las chaves seleccionadas? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "¿Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estabrece-la lista de preferencias"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "¿Realmente desexa actualiza-las preferencias? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "¿Garda-los cambios? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "¿Saír sin gardar? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "a actualización fallou: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "¡Non pode borra-lo último ID de usuario!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "fallou a comprobación da sinatura creada: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "fallou a comprobación da sinatura creada: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "erro: pegada dactilar non válida\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valor non válido\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Non hai tal ID de usuario.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s non é un xogo de caracteres válido\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "erro: pegada dactilar non válida\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "non se atopou a chave `%s': %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Resumo: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Características: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notación: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Esta chave pode estar revocada por %s chave "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Esta chave pode estar revocada por %s chave "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "non foi posible crear %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada] "
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Esta chave está desactivada"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4631,20 -3618,14 +4582,20 @@@ msgstr "
"Teña en conta que a validez da chave amosada non é necesariamente\n"
"correcta a menos que reinicie o programa.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4652,17 -3633,14 +4603,17 @@@ msgstr "
"AVISO: non se marcou ningún ID de usuario coma primario. Esta orde pode\n"
" facer que un ID de usuario diferente se converta no primario.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4671,37 -3649,29 +4622,37 @@@ msgstr "
"AVISO: Esta é unha chave de estilo PGP2. Se engade unha identificación\n"
" fotográfica algunhas versións de PGP han rexeitar esta chave.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "¿Está seguro de que quere engadila? (s/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Non pode engadir unha identificación fotográfica a unha chave de estilo "
"PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4709,38 -3679,31 +4660,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Borrada %d sinatura.\n"
msgstr[1] "Borrada %d sinatura.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Non se borrou nada.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "armadura non válida"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "O ID de usuario \"%s\" está revocado."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "O ID de usuario \"%s\" está revocado."
msgstr[1] "O ID de usuario \"%s\" está revocado."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o ID de usuario \"%s\" xa está revocado\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o ID de usuario \"%s\" xa está revocado\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4750,43 -3713,35 +4701,43 @@@ msgstr "
"designado\n"
" pode facer que algunhas versións de PGP rexeiten esta chave.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduza o ID de usuario do revocador designado: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4794,182 -3749,149 +4745,187 @@@
msgstr ""
"¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando a data de expiración para a chave secundaria.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando a data de expiración da chave primaria.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Escolla exactamente un ID de usuario.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "¿Está seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "¿Está seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Notación de sinaturas: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "¿Sobrescribir? (s/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Non hai ID de usuario con índice %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Non hai ID de usuario con índice %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Non hai ID de usuario con índice %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Non hai ID de usuario con índice %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " asinada por %08lX no %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta sinatura caducou o %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "¿Está seguro de que quere revocala? (s/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " asinada por %08lX no %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Asinou estes IDs de usuario: \n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocada por %08lX no %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Está a punto de revocar estas sinaturas:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "non hai chave secreta\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o ID de usuario \"%s\" xa está revocado\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "¡Non pode borra-lo último ID de usuario!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa está revocado\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa está revocado\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opcións de importación non válidas\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "preferencia %c%lu duplicada\n"
@@@ -5416,8 -4261,6 +5372,8 @@@ msgstr "
"mentres se xeran os números primos; isto proporciónalle ao xerador de\n"
"números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeración da chave fallou: %s\n"
@@@ -5491,7 -4321,6 +5447,7 @@@ msgstr "erro escribindo no chaveiro pú
msgid "public and secret key created and signed.\n"
msgstr "creáronse e asináronse as chaves pública e secreta.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5501,7 -4330,6 +5457,7 @@@ msgstr "
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5509,7 -4337,6 +5465,7 @@@ msgstr "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5517,51 -4344,40 +5473,51 @@@ msgstr "
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a creación de subchaves para chaves v3 non cumpre OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "¿Crear realmente? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Normativa de sinaturas críticas: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Normativa de sinaturas: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Notación de sinaturas críticas: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Notación de sinaturas: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5569,7 -4385,20 +5525,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d sinaturas erróneas\n"
msgstr[1] "%d sinaturas erróneas\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d sinaturas erróneas\n"
+ msgstr[1] "%d sinaturas erróneas\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
+ msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5577,41 -4406,33 +5549,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 sinatura non verificada debido a un erro\n"
msgstr[1] "1 sinatura non verificada debido a un erro\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Chaveiro"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Pegada dactilar ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5723,264 -4523,215 +5695,270 @@@ msgid "no keyserver known (use option -
msgstr ""
"non hai un servidor de chaves coñecido (empregue a opción --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "omítese `%s': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"asinado coa súa chave %08lX no %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "tamaño moi estraño para unha chave de sesión cifrada (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "chave de sesión cifrada con %s\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrado cun algoritmo descoñecido %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "a chave pública é %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados coa chave pública: DEK correcto\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado cunha chave %s, ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "fallou o descifrado de chave pública: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrado con %lu contrasinais\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "cifrado con 1 contrasinal\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "supoñendo datos cifrados con %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "A cifra IDEA non está dispoñible, téntase empregar %s no seu canto\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "AVISO: a mensaxe non tiña protección de integridade\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remitente pediu \"confidencial\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro orixinal='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Sinatura INCORRECTA de\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Sinatura caducada de \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "verificación de sinatura suprimida\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "non se poden manexar estas sinaturas múltiples\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Chave dispoñible en: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "AVISO: ¡Esta chave non está certificada cunha sinatura de confianza!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "A sinatura caduca o %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "modo texto"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "descoñecido"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave pública descoñecido"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Non foi posible verifica-la sinatura: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "non é unha sinatura separada\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVISO: detectáronse sinaturas múltiples. Só se ha comproba-la primeira.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "sinatura independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
@@@ -6043,67 -4783,54 +6021,67 @@@ msgstr "erro de lectura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opción a extinguir \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "empregue \"%s%s\" no seu canto\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Sen comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "Sen comprimir"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lendo as opcións de `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario por defecto `%s' descoñecido\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "clase de sinatura descoñecida"
@@@ -6622,35 -5250,32 +6600,40 @@@ msgstr "non foi posible abri-los datos
msgid "can't open signed data fd=%d: %s\n"
msgstr "non foi posible abri-los datos asinados `%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "chave %08lX: non hai ID de usuario\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinatario anónimo; tentando a chave secreta %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "vale, nós somo-lo destinatario anónimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "a codificación vella do DEK non está soportada\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "o algoritmo de cifrado %d%s é descoñecido ou está desactivado\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6811,7 -5408,6 +6794,7 @@@ msgstr "(Non se deu unha descrición)\n
msgid "Is this okay? (y/N) "
msgstr "¿É correcto? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "creouse unha chave feble - volvendo a tentalo\n"
@@@ -6832,42 -5425,40 +6815,48 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "non se pode empregar %s no modo %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = amosar máis información\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
msgstr[1] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
msgstr[1] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6880,7 -5471,6 +6869,7 @@@ msgstr[1] "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6892,92 -5482,76 +6881,92 @@@ msgstr[1] "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: a chave está revocada"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"asumindo unha sinatura incorrecta da chave %08lX debido a un bit crítico "
"descoñecido\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"chave %08lX: non hai unha sub-chave para o paquete de a revocación de "
"subchave\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "chave %08lX: non hai sub-chave para a sinatura da ligazón da chave\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVISO: non se pode expandir-%% a notación (grande de máis). Úsase sen "
"expandir.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Sinatura %s de: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "asinando:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "hase empregar cifrado %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "omítese `%s': duplicada\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "omítese: a chave secreta xa está presente\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7067,7 -5625,6 +7056,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
@@@ -7179,149 -5714,120 +7168,149 @@@ msgstr "non é posible manexar liñas d
msgid "input line longer than %d characters\n"
msgstr "a liña de entrada contén máis de %d caracteres\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmos soportados:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "listar chave e IDs de usuario"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Normativa: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "ve-la lista de chaves"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7329,68 -5835,58 +7318,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "cifrado con %lu contrasinais\n"
msgstr[1] "cifrado con %lu contrasinais\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
@@@ -7398,149 -5894,123 +7387,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Borradas %d sinaturas.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "cifrado con %lu contrasinais\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Normativa: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7557,18 -6027,14 +7546,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7806,19 -6227,14 +7795,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7867,44 -6274,35 +7856,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "borrar chaves do chaveiro público"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
@@@ -7912,54 -6310,43 +7901,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "cambia-lo contrasinal"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "o envío ao servidor de chaves fallou: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7969,26 -6356,21 +7958,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "cambia-lo contrasinal"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "cambia-lo contrasinal"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Por favor, escolla o motivo da revocación:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7996,117 -6378,93 +7985,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "cambia-lo contrasinal"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "cambia-lo contrasinal"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' xa está comprimido\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "xerar un novo par de chaves"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "xerar un novo par de chaves"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI non soportado"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "A xeración da chave fallou: %s\n"
msgstr[1] "A xeración da chave fallou: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "non se atoparon datos OpenPGP válidos.\n"
@@@ -8128,11 -6483,9 +8117,11 @@@ msgstr "Introduza o ID de usuario:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
@@@ -8188,12 -6530,10 +8177,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8268,9 -6593,6 +8257,9 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@@ -8469,7 -6751,6 +8458,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8513,7 -6787,6 +8502,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@@ -8778,11 -6998,9 +8767,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8811,139 -7024,108 +8800,139 @@@ msgstr "certificado duplicado - borrado
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Non se deu unha descrición)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "ve-la lista de chaves secretas"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "Revocación de certificado válida"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "Certificado correcto"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "Certificado correcto"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crear saída con armadura en ascii"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "non usa-la terminal en absoluto"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "modo por lotes: non preguntar nunca"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "asumir `si' na maioría das preguntas"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "asumir `non' na maioría das preguntas"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "engadir este chaveiro á lista de chaveiros"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8954,47 -7136,38 +8943,47 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operación por defecto depende dos datos de entrada\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "non se puido conectar a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "destinatario por defecto `%s' descoñecido\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Non se deu unha descrición)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = omitir esta chave\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "escribindo a `%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9057,7 -7218,6 +9046,7 @@@ msgstr "rev? problema ao comproba-la re
msgid "error storing flags: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9086,7 -7242,6 +9075,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9100,51 -7254,41 +9089,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "o algoritmo de protección %d%s non está soportado\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "fallou a comprobación da sinatura creada: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "A sinatura caducou o %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Sinatura correcta de \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " alias \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9951,116 -7934,88 +9940,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "¿Saír sin gardar? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10073,91 -8028,72 +10062,91 @@@ msgstr "
"@\n"
"(Vexa a páxina man para un listado completo de comandos e opcións)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opcións] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "¡%s non se admite con %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "non se puido poñe-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "non se puido poñe-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "liña longa de máis\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "erro: pegada dactilar non válida\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "erro de lectura: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "non procesado"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10337,7 -8237,14 +10326,18 @@@ msgstr "\"%s\" non é un ficheiro JPEG\
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "erro lendo `%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
@@@ -10402,12 -8297,10 +10402,12 @@@ msgstr "buscando \"%s\" no servidor HK
msgid "malloc failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10471,12 -8352,6 +10471,7 @@@ msgstr "erro escribindo no chaveiro `%s
msgid "error reading HTTP response for '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "erro lendo `%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@@ -10595,77 -8446,61 +10590,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: fallo ao crear unha táboa hash: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10802,194 -8608,147 +10797,194 @@@ msgstr "fallou a sinatura: %s\n
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
#, fuzzy
msgid "Options useful for debugging"
msgstr "habilitar depuración total"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|emprega-lo modo de contrasinal N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifrar para NOME"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "erro de rede"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "contrasinal erróneo"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "non se atopou a chave pública"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "erro lendo `%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "erro lendo `%s': %s\n"
@@@ -11062,27 -8805,22 +11057,27 @@@ msgstr "usar coma ficheiro de saída
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "non se atopou a chave pública"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "gravando a chave secreta en `%s'\n"
diff --cc po/gnupg2.pot
index 544165e,83f9ca9..3cb15a1
--- 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.21\n"
-"Project-Id-Version: GNU gnupg 2.1.0\n"
++"Project-Id-Version: GNU gnupg 2.1.22\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\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"
-"Language: zh_TW\n"
++"POT-Creation-Date: 2017-07-28 19: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
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
+msgstr ""
#. TRANSLATORS: These are labels for buttons etc used in
#. Pinentries. An underscore indicates that the next letter
@@@ -29,47 -30,47 +29,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
-msgstr "|pinentry-label|_OK"
+msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
-msgstr "|pinentry-label|取消 (_C)"
+msgstr ""
- #: agent/call-pinentry.c:501
-#, fuzzy
-#| msgid "|pinentry-label|_OK"
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
-msgstr "|pinentry-label|_OK"
+msgstr ""
- #: agent/call-pinentry.c:502
-#, fuzzy
-#| msgid "|pinentry-label|_OK"
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
-msgstr "|pinentry-label|_OK"
+msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
-msgstr "|pinentry-label|個人識別碼 (PIN):"
+msgstr ""
- #: agent/call-pinentry.c:504
-#, fuzzy
-#| msgid "|pinentry-label|_Cancel"
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
-msgstr "|pinentry-label|取消 (_C)"
+msgstr ""
- #: agent/call-pinentry.c:505
-#, fuzzy
-#| msgid "Do you really want to permanently delete the OpenPGP secret key:"
++#: agent/call-pinentry.c:509
msgid "Do you really want to make your passphrase visible on the screen?"
-msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
+msgstr ""
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
-#, fuzzy
-#| msgid "Enter new passphrase"
++#: agent/call-pinentry.c:512
msgid "|pinentry-tt|Hide passphrase"
-msgstr "請輸入新密語"
+msgstr ""
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
-msgstr "優劣程度: %s"
+msgstr ""
#. TRANSLATORS: This string is a tooltip, shown by pinentry when
#. hovering over the quality bar. Please use an appropriate
@@@ -77,237 -78,179 +77,237 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
-"上列輸入文字的優劣程度.\n"
-"關於此規範的細節, 請洽你的系統管理者."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
-msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
+msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
-msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
+msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
-msgstr "密語:"
+msgstr ""
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 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
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
-msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
+msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
-msgstr "重複:"
+msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
-msgstr "個人識別碼 (PIN) 太長"
+msgstr ""
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
-msgstr "密語太長"
+msgstr ""
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
-msgstr "個人識別碼 (PIN) 含有無效的字符"
+msgstr ""
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
-msgstr "個人識別碼 (PIN) 太短"
+msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
-msgstr "不良的個人識別碼 (PIN)"
+msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
-msgstr "不良的密語"
+msgstr ""
+#: 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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
-msgstr "無法建立 '%s': %s\n"
+msgstr ""
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
-msgstr "無法開啟 '%s': %s\n"
+msgstr ""
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
-msgstr "偵測到卡片, 其序號為: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, c-format
msgid "no authentication key for ssh on card: %s\n"
-msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
-msgstr "找不到合適的卡片金鑰: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2600
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
++#: agent/command-ssh.c:2614
+#, c-format
msgid "error getting list of cards: %s\n"
-msgstr "取得已存放的旗標時出錯: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
-msgstr "允許"
+msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
-msgstr "拒絕"
+msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
-msgstr "請再次輸入密語"
+msgstr ""
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
-msgstr "從 socket 建立串流失敗: %s\n"
+msgstr ""
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
-msgstr "請插入下列序號的卡片:"
+msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
-msgstr "請移除現用中的卡片並插入下列序號的卡片:"
+msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
-msgstr "管理者個人識別碼 (PIN)"
+msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
-msgstr "PIN 重設碼 (PUK)"
+msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
-msgstr "重設碼"
+msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
-msgstr "%s%%0A%%0A使用讀卡機的鍵盤來輸入."
+msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
-msgstr "請再次輸入重設碼"
+msgstr ""
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
-msgstr "請再次輸入 PUK"
+msgstr ""
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
-msgstr "請再次輸入個人識別碼 (PIN)"
+msgstr ""
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
-msgstr "前後兩次輸入的重設碼不一致; 請再試一次"
+msgstr ""
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
-msgstr "前後兩次輸入的 PUK 不一致; 請再試一次"
+msgstr ""
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
-msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
+msgstr ""
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
-msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開卡片"
+msgstr ""
+#: agent/genkey.c:110 sm/certreqgen-ui.c:390
#, c-format
msgid "error creating temporary file: %s\n"
-msgstr "建立暫存檔時出錯: %s\n"
+msgstr ""
+#: agent/genkey.c:117
#, c-format
msgid "error writing to temporary file: %s\n"
-msgstr "寫入暫存檔時出錯: %s\n"
+msgstr ""
+#: agent/genkey.c:158 agent/genkey.c:164
msgid "Enter new passphrase"
-msgstr "請輸入新密語"
+msgstr ""
+#: agent/genkey.c:172
msgid "Take this one anyway"
-msgstr "無論如何還是要用這個"
+msgstr ""
+#: agent/genkey.c:202
#, c-format
msgid ""
"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -336,317 -276,251 +336,326 @@@ msgstr[1] "
msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
msgid_plural ""
"A passphrase should contain at least %u digits or%%0Aspecial characters."
-msgstr[0] "密語至少得要含有 %u 個數字或%%0A特別字符."
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+#: agent/genkey.c:278
+#, c-format
msgid "A passphrase may not be a known term or match%%0Acertain pattern."
-msgstr "密語不得含有已知的詞彙, 亦不得與%%0A確知的模式吻合."
+msgstr ""
+#: agent/genkey.c:293
msgid "Warning: You have entered an insecure passphrase."
-msgstr "警告: 你輸入了不安全的密語."
+msgstr ""
+#: agent/genkey.c:480
#, c-format
msgid "Please enter the passphrase to%0Aprotect your new key"
-msgstr "請輸入密語至%0A以保護你的新金鑰"
+msgstr ""
+#: agent/genkey.c:606
msgid "Please enter the new passphrase"
-msgstr "請輸入新的密語"
+msgstr ""
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
msgstr ""
-"@選項:\n"
-" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
-msgstr "以服務模式執行 (背景)"
+msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
-msgstr "以伺服器模式執行 (前景)"
+msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
-#, fuzzy
-#| msgid "run in server mode"
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
msgid "run in supervised mode"
-msgstr "以伺服器模式執行"
+msgstr ""
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: 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
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
-msgstr "sh 樣式的指令輸出"
+msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
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
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 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
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
-msgstr "不要從 console 分離"
+msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
-msgstr "不要奪取鍵盤及滑鼠"
+msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
-msgstr "為伺服器使用日誌檔"
+msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
+msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
+msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
-msgstr "不要使用 SCdaemon"
+msgstr ""
- #: agent/gpg-agent.c:185
-#, fuzzy
-#| msgid "|NAME|connect to host NAME"
++#: agent/gpg-agent.c:186
msgid "|NAME|accept some commands via NAME"
-msgstr "|名稱|連線至位於指定名稱的主機"
+msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
-msgstr "忽略變更 TTY 的要求"
+msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
-msgstr "忽略變更 X display 的要求"
+msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
-msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
+msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
-msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
+msgstr ""
- #: agent/gpg-agent.c:222
-#, fuzzy
-#| msgid "do not allow the reuse of old passphrases"
++#: agent/gpg-agent.c:223
msgid "disallow the use of an external password cache"
-msgstr "不允許重複使用舊密語"
+msgstr ""
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
-msgstr "不允許用戶端將金鑰標記為 \"已信任\""
+msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
-msgstr "允許預先設定密語"
+msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
-msgstr "啟用 ssh 支援"
+msgstr ""
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
-msgstr "啟用 putty 支援"
+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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
+msgstr ""
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
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:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
-msgstr "給定的除錯等級 '%s' 無效\n"
+msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
-msgstr "所選的摘要演算法無效\n"
++msgstr ""
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
-msgstr "從 '%s' 讀取選項中\n"
+msgstr ""
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, 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
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, 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
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
-msgstr "socket 名稱 '%s' 太長\n"
+msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
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
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
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
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
-msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
-#, fuzzy, c-format
-#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
+#, 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
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, 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
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, 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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
-msgstr "'%s' 的 stat() 失敗: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, 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
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
-msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
+msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
+msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, 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
++#: agent/gpg-agent.c:2752
#, 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:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
+msgstr ""
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
-msgstr "%s %s 已停止\n"
+msgstr ""
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
+msgstr ""
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
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:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
msgstr ""
-"@指令:\n"
-" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -682,55 -555,46 +691,55 @@@ msgid "
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
-"請輸入完成這項操作所需的\n"
-"密語或個人識別碼 (PIN)."
+#: agent/protect-tool.c:720 tools/symcryptrun.c:462
msgid "cancelled\n"
-msgstr "已取消\n"
+msgstr ""
+#: agent/protect-tool.c:722 tools/symcryptrun.c:458
#, c-format
msgid "error while asking for the passphrase: %s\n"
-msgstr "詢問密語時出錯: %s\n"
+msgstr ""
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
-msgstr "開啟 '%s' 時出錯: %s\n"
+msgstr ""
+#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
#, c-format
msgid "file '%s', line %d: %s\n"
-msgstr "檔案 '%s', 第 %d 列: %s\n"
+msgstr ""
+#: agent/trustlist.c:192 agent/trustlist.c:200
#, c-format
msgid "statement \"%s\" ignored in '%s', line %d\n"
-msgstr "陳述句 \"%s\" 忽略於 '%s', 第 %d 列\n"
+msgstr ""
+#: agent/trustlist.c:206
#, c-format
msgid "system trustlist '%s' not available\n"
-msgstr "沒有系統信任清單 '%s' 可用\n"
+msgstr ""
+#: agent/trustlist.c:250
#, c-format
msgid "bad fingerprint in '%s', line %d\n"
-msgstr "不良的指紋於 '%s', 第 %d 列\n"
+msgstr ""
+#: agent/trustlist.c:275 agent/trustlist.c:282
#, c-format
msgid "invalid keyflag in '%s', line %d\n"
-msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
+msgstr ""
+#: agent/trustlist.c:316 common/helpfile.c:136
#, c-format
msgid "error reading '%s', line %d: %s\n"
-msgstr "讀取 '%s' 時出錯, 第 %d 列: %s\n"
+msgstr ""
+#: agent/trustlist.c:434 agent/trustlist.c:503
msgid "error reading list of trusted root certificates\n"
-msgstr "讀取已信任根憑證清單時出錯\n"
+msgstr ""
#. TRANSLATORS: This prompt is shown by the Pinentry
#. and has one special property: A "%%0A" is used by
@@@ -745,16 -608,13 +754,16 @@@
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
-msgstr "請問你是否徹底信任%%0A \"%s\"%%0A正確驗證使用者憑證的能力?"
+msgstr ""
+#: agent/trustlist.c:673 common/audit.c:467
msgid "Yes"
-msgstr "Yes"
+msgstr ""
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: 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,227 -647,181 +801,227 @@@ msgstr "
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
-msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s. 請現在就變更."
+msgstr ""
+#: agent/findkey.c: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:1490
-#, fuzzy, c-format
-#| msgid "Do you really want to delete the selected keys? (y/N) "
++#: agent/findkey.c:1491
+#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
-msgstr "刪除金鑰"
+msgstr ""
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
-"警告: 這把金鑰同時列為 SSH 所使用!\n"
-"刪除這把金鑰可能會讓你失去存取遠端機器的能力."
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
+msgstr ""
+#: agent/pksign.c:187 sm/certcheck.c:97
#, c-format
msgid "%s key uses an unsafe (%u bit) hash\n"
-msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
+msgstr ""
+#: agent/pksign.c:202
#, c-format
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
-msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
+msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
-msgstr "檢查已建立的簽章時出錯: %s\n"
+msgstr ""
+#: agent/cvt-openpgp.c:338
msgid "secret key parts are not available\n"
-msgstr "私鑰部分無法取用\n"
+msgstr ""
+#: agent/cvt-openpgp.c:344
#, c-format
msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "公鑰演算法 %d (%s) 未支援\n"
+msgstr ""
+#: agent/cvt-openpgp.c:448
#, c-format
msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "保護演算法 %d (%s) 未支援\n"
+msgstr ""
+#: agent/cvt-openpgp.c:455
#, c-format
msgid "protection hash algorithm %d (%s) is not supported\n"
-msgstr "保護雜湊演算法 %d (%s) 未支援\n"
+msgstr ""
+#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
+#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
+#: dirmngr/ldap-wrapper.c:711
#, c-format
msgid "error creating a pipe: %s\n"
-msgstr "建立管道時出錯: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
+#: common/exechelp-w32.c:513
#, c-format
msgid "error creating a stream for a pipe: %s\n"
-msgstr "建立管道串流時出錯: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
-msgstr "衍生執行程序時出錯: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "等候 %d 處理程序終止時失敗: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
#, c-format
msgid "error running '%s': probably not installed\n"
-msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
+msgstr ""
+#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
+#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
-msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
+msgstr ""
+#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
#, c-format
msgid "error running '%s': terminated\n"
-msgstr "執行 '%s' 時出錯: 已終止\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
+#, c-format
msgid "waiting for processes to terminate failed: %s\n"
-msgstr "等候 %d 處理程序終止時失敗: %s\n"
+msgstr ""
+#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
#, c-format
msgid "error getting exit code of process %d: %s\n"
-msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
+msgstr ""
+#: common/simple-pwquery.c:260
#, c-format
msgid "can't connect to '%s': %s\n"
-msgstr "無法連接至 '%s': %s\n"
+msgstr ""
+#: common/simple-pwquery.c:270
msgid "problem setting the gpg-agent options\n"
-msgstr "設定 gpg-agent 選項時發生問題\n"
+msgstr ""
+#: common/sysutils.c:148
#, c-format
msgid "can't disable core dumps: %s\n"
-msgstr "無法讓系統停止傾印核心檔: %s\n"
+msgstr ""
+#: common/sysutils.c:250
#, c-format
msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
+msgstr ""
+#: common/sysutils.c:282
#, c-format
msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "waiting for the agent to come up ... (%ds)\n"
+#: common/sysutils.c:693
+#, c-format
msgid "waiting for file '%s' to become accessible ...\n"
-msgstr "正在等候代理程式出現 ... (%d 秒)\n"
+msgstr ""
+#: common/sysutils.c:719
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
-msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
msgid "yes"
-msgstr "yes"
+msgstr ""
+#: common/yesno.c:46 common/yesno.c:87
msgid "yY"
-msgstr "yY"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
msgid "no"
-msgstr "no"
+msgstr ""
+#: common/yesno.c:49 common/yesno.c:88
msgid "nN"
-msgstr "nN"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
msgid "quit"
-msgstr "quit"
+msgstr ""
+#: common/yesno.c:89
msgid "qQ"
-msgstr "qQ"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
msgid "okay|okay"
-msgstr "okay|okay"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
msgid "cancel|cancel"
-msgstr "cancel|cancel"
+msgstr ""
+#: common/yesno.c:126
msgid "oO"
-msgstr "oO"
+msgstr ""
+#: common/yesno.c:127
msgid "cC"
-msgstr "cC"
+msgstr ""
+#: common/miscellaneous.c:86
#, c-format
msgid "out of core in secure memory while allocating %lu bytes"
-msgstr "在安全記憶體配置 %lu 位元組時超出核心"
+msgstr ""
+#: common/miscellaneous.c:89
#, c-format
msgid "out of core while allocating %lu bytes"
-msgstr "配置 %lu 位元組時超出核心"
+msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
-msgstr "配置足夠的記憶體時出錯: %s\n"
+msgstr ""
+#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
+msgstr ""
+#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
+msgstr ""
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1051,1099 -855,861 +1060,1101 @@@ msgstr "
#. TRANSLATORS: Copy the prefix between the vertical bars
#. verbatim. It will not be printed.
+#: common/audit.c:474
msgid "|audit-log-result|Good"
-msgstr "|audit-log-result|良好"
+msgstr ""
+#: common/audit.c:477
msgid "|audit-log-result|Bad"
-msgstr "|audit-log-result|不良"
+msgstr ""
+#: common/audit.c:479
msgid "|audit-log-result|Not supported"
-msgstr "|audit-log-result|不支援"
+msgstr ""
+#: common/audit.c:481
msgid "|audit-log-result|No certificate"
-msgstr "|audit-log-result|沒有憑證"
+msgstr ""
+#: common/audit.c:483
msgid "|audit-log-result|Not enabled"
-msgstr "|audit-log-result|未啟用"
+msgstr ""
+#: common/audit.c:485
msgid "|audit-log-result|Error"
-msgstr "|audit-log-result|錯誤"
+msgstr ""
+#: common/audit.c:487
msgid "|audit-log-result|Not used"
-msgstr "|audit-log-result|未使用"
+msgstr ""
+#: common/audit.c:489
msgid "|audit-log-result|Okay"
-msgstr "|audit-log-result|沒問題"
+msgstr ""
+#: common/audit.c:491
msgid "|audit-log-result|Skipped"
-msgstr "|audit-log-result|已跳過"
+msgstr ""
+#: common/audit.c:493
msgid "|audit-log-result|Some"
-msgstr "|audit-log-result|有些"
+msgstr ""
+#: common/audit.c:726
msgid "Certificate chain available"
-msgstr "有可用的憑證鏈"
+msgstr ""
+#: common/audit.c:733
msgid "root certificate missing"
-msgstr "根憑證遺失"
+msgstr ""
+#: common/audit.c:759
msgid "Data encryption succeeded"
-msgstr "資料已加密成功"
+msgstr ""
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
msgid "Data available"
-msgstr "有可用的資料"
+msgstr ""
+#: common/audit.c:767
msgid "Session key created"
-msgstr "階段金鑰已建立"
+msgstr ""
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
#, c-format
msgid "algorithm: %s"
-msgstr "演算法: %s"
+msgstr ""
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
-msgstr "未支援的演算法: %s"
+msgstr ""
+#: common/audit.c:778 common/audit.c:925
msgid "seems to be not encrypted"
-msgstr "看起來未加密"
+msgstr ""
+#: common/audit.c:784 common/audit.c:933
msgid "Number of recipients"
-msgstr "收件者數量"
+msgstr ""
+#: common/audit.c:792 common/audit.c:956
#, c-format
msgid "Recipient %d"
-msgstr "收件者 %d"
+msgstr ""
+#: common/audit.c:825
msgid "Data signing succeeded"
-msgstr "資料已簽署成功"
+msgstr ""
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
#, c-format
msgid "data hash algorithm: %s"
-msgstr "資料雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:862
#, c-format
msgid "Signer %d"
-msgstr "簽署者 %d"
+msgstr ""
+#: common/audit.c:866 common/audit.c:1065
#, c-format
msgid "attr hash algorithm: %s"
-msgstr "屬性雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:901
msgid "Data decryption succeeded"
-msgstr "資料已解密成功"
+msgstr ""
+#: common/audit.c:910
msgid "Encryption algorithm supported"
-msgstr "支援的加密演算法"
+msgstr ""
+#: common/audit.c:993
msgid "Data verification succeeded"
-msgstr "資料驗證成功"
+msgstr ""
+#: common/audit.c:1002
msgid "Signature available"
-msgstr "有可用的簽章"
+msgstr ""
+#: common/audit.c:1024
msgid "Parsing data succeeded"
-msgstr "剖析資料成功"
+msgstr ""
+#: common/audit.c:1036
#, c-format
msgid "bad data hash algorithm: %s"
-msgstr "不良的資料雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:1051
#, c-format
msgid "Signature %d"
-msgstr "簽章 %d"
+msgstr ""
+#: common/audit.c:1079
msgid "Certificate chain valid"
-msgstr "憑證鏈有效"
+msgstr ""
+#: common/audit.c:1090
msgid "Root certificate trustworthy"
-msgstr "根憑證可信賴"
+msgstr ""
+#: common/audit.c:1111 sm/certchain.c:1009
msgid "no CRL found for certificate"
-msgstr "找不到用於憑證的 CRL"
+msgstr ""
+#: common/audit.c:1114 sm/certchain.c:1019
msgid "the available CRL is too old"
-msgstr "可用的 CRL 太舊了"
+msgstr ""
+#: common/audit.c:1119
msgid "CRL/OCSP check of certificates"
-msgstr "CRL/OCSP 憑證檢查"
+msgstr ""
+#: common/audit.c:1139
msgid "Included certificates"
-msgstr "包含在內的憑證"
+msgstr ""
+#: common/audit.c:1194
msgid "No audit log entries."
-msgstr "沒有稽核日誌項目."
+msgstr ""
+#: common/audit.c:1243
msgid "Unknown operation"
-msgstr "未知的操作"
+msgstr ""
+#: common/audit.c:1261
msgid "Gpg-Agent usable"
-msgstr "Gpg-Agent 可以使用"
+msgstr ""
+#: common/audit.c:1271
msgid "Dirmngr usable"
-msgstr "Dirmngr 可以使用"
+msgstr ""
+#: common/audit.c:1307
#, c-format
msgid "No help available for '%s'."
-msgstr "'%s' 沒有可用的說明."
+msgstr ""
+#: common/helpfile.c:90
msgid "ignoring garbage line"
-msgstr "忽略垃圾列"
+msgstr ""
+#: common/gettime.c:887
msgid "[none]"
-msgstr "[ 無 ]"
+msgstr ""
+#: common/ksba-io-support.c:338
#, c-format
msgid "invalid radix64 character %02x skipped\n"
-msgstr "已跳過無效的 radix64 字符 %02x\n"
+msgstr ""
+#: common/argparse.c:365
msgid "argument not expected"
-msgstr "沒料到有引數"
+msgstr ""
+#: common/argparse.c:367
msgid "read error"
-msgstr "讀取錯誤"
+msgstr ""
+#: common/argparse.c:369
msgid "keyword too long"
-msgstr "關鍵字太長"
+msgstr ""
+#: common/argparse.c:371
msgid "missing argument"
-msgstr "無效的引數"
+msgstr ""
+#: common/argparse.c:373
msgid "invalid argument"
-msgstr "無效的引數"
+msgstr ""
+#: common/argparse.c:375
msgid "invalid command"
-msgstr "無效的指令"
+msgstr ""
+#: common/argparse.c:377
msgid "invalid alias definition"
-msgstr "無效的別名定義"
+msgstr ""
+#: common/argparse.c:379
msgid "out of core"
-msgstr "超出核心"
+msgstr ""
+#: common/argparse.c:381
msgid "invalid option"
-msgstr "無效的選項"
+msgstr ""
+#: common/argparse.c:389
#, c-format
msgid "missing argument for option \"%.50s\"\n"
-msgstr "\"%.50s\" 選項遺失了引數\n"
+msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
-msgstr "選項 \"%.50s\" 的引數無效\n"
+msgstr ""
+#: common/argparse.c:393
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
-msgstr "\"%.50s\" 選項沒料到會有引數\n"
+msgstr ""
+#: common/argparse.c:395
#, c-format
msgid "invalid command \"%.50s\"\n"
-msgstr "無效的指令 \"%.50s\"\n"
+msgstr ""
+#: common/argparse.c:397
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
-msgstr "\"%.50s\" 選項不明確\n"
+msgstr ""
+#: common/argparse.c:399
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
-msgstr "\"%.50s\" 指令不明確\n"
+msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
-msgstr "超出核心\n"
+msgstr ""
+#: common/argparse.c:403
#, c-format
msgid "invalid option \"%.50s\"\n"
-msgstr "無效的選項 \"%.50s\"\n"
+msgstr ""
+#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
-msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
+msgstr ""
+#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
-msgstr "iconv_open 失敗: %s\n"
+msgstr ""
+#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
-msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
+msgstr ""
+#: common/dotlock.c:707
#, c-format
msgid "failed to create temporary file '%s': %s\n"
-msgstr "建立暫存檔失敗 '%s': %s\n"
+msgstr ""
+#: common/dotlock.c:771
#, c-format
msgid "error writing to '%s': %s\n"
-msgstr "寫入 '%s' 時出錯: %s\n"
+msgstr ""
+#: common/dotlock.c:1116
#, c-format
msgid "removing stale lockfile (created by %d)\n"
-msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
+msgstr ""
+#: common/dotlock.c:1152
#, c-format
msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
+msgstr ""
+#: common/dotlock.c:1153
msgid "(deadlock?) "
-msgstr "(死結嗎?) "
+msgstr ""
+#: common/dotlock.c:1192
#, c-format
msgid "lock '%s' not made: %s\n"
-msgstr "未鎖定 '%s': %s\n"
+msgstr ""
+#: common/dotlock.c:1219
#, c-format
msgid "waiting for lock %s...\n"
-msgstr "正在等候 `%s' 鎖定...\n"
+msgstr ""
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
-msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
+msgstr ""
+#: g10/armor.c:423
#, c-format
msgid "armor: %s\n"
-msgstr "封裝: %s\n"
+msgstr ""
+#: g10/armor.c:462
msgid "invalid armor header: "
-msgstr "無效的封裝檔頭: "
+msgstr ""
+#: g10/armor.c:473
msgid "armor header: "
-msgstr "封裝檔頭: "
+msgstr ""
+#: g10/armor.c:486
msgid "invalid clearsig header\n"
-msgstr "無效的明文簽章檔頭\n"
+msgstr ""
+#: g10/armor.c:499
msgid "unknown armor header: "
-msgstr "未知的封裝檔頭: "
+msgstr ""
+#: g10/armor.c:552
msgid "nested clear text signatures\n"
-msgstr "多層明文簽章\n"
+msgstr ""
+#: g10/armor.c:687
msgid "unexpected armor: "
-msgstr "未預期的封裝: "
+msgstr ""
+#: g10/armor.c:700
msgid "invalid dash escaped line: "
-msgstr "無效的破折號逸出列: "
+msgstr ""
+#: g10/armor.c:872 g10/armor.c:1492
#, c-format
msgid "invalid radix64 character %02X skipped\n"
-msgstr "無效的 64 進位字符 %02x 已跳過\n"
+msgstr ""
+#: g10/armor.c:915
msgid "premature eof (no CRC)\n"
-msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
+msgstr ""
+#: g10/armor.c:949
msgid "premature eof (in CRC)\n"
-msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
+msgstr ""
+#: g10/armor.c:957
msgid "malformed CRC\n"
-msgstr "格式不對的 CRC\n"
+msgstr ""
+#: g10/armor.c:961 g10/armor.c:1529
#, c-format
msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC 錯誤; %06lX - %06lX\n"
+msgstr ""
+#: g10/armor.c:981
msgid "premature eof (in trailer)\n"
-msgstr "檔案未預期的結束 (於結尾處)\n"
+msgstr ""
+#: g10/armor.c:985
msgid "error in trailer line\n"
-msgstr "結尾列有問題\n"
+msgstr ""
+#: g10/armor.c:1305
msgid "no valid OpenPGP data found.\n"
-msgstr "找不到有效的 OpenPGP 資料.\n"
+msgstr ""
+#: g10/armor.c:1310
#, c-format
msgid "invalid armor: line longer than %d characters\n"
-msgstr "無效的封裝: 列長超出 %d 字符\n"
+msgstr ""
+#: g10/armor.c:1314
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "not human readable"
+#: g10/build-packet.c:1210
+#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
-msgstr "不是人類能讀得懂的"
+msgstr ""
+#: g10/build-packet.c:1262
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
-msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+msgstr ""
+#: g10/build-packet.c:1274 g10/build-packet.c:1370
msgid "a user notation name must contain the '@' character\n"
-msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+msgstr ""
+#: g10/build-packet.c:1280 g10/build-packet.c:1376
msgid "a notation name must not contain more than one '@' character\n"
-msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+msgstr ""
+#: g10/build-packet.c:1298
msgid "a notation value must not use any control characters\n"
-msgstr "標記值一定不能使用任何的控制字符\n"
+msgstr ""
-#, fuzzy
-#| msgid "a notation name must not contain more than one '@' character\n"
+#: g10/build-packet.c:1354
msgid "a notation name may not contain an '=' character\n"
-msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+msgstr ""
-#, fuzzy
-#| msgid ""
-#| "a notation name must have only printable characters or spaces, and end "
-#| "with an '='\n"
+#: g10/build-packet.c:1360
msgid "a notation name must have only printable characters or spaces\n"
-msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+msgstr ""
+#: g10/build-packet.c:1419 g10/build-packet.c:1430
msgid "WARNING: invalid notation data found\n"
-msgstr "警告: 找到無效的標記資料\n"
+msgstr ""
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
-msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
+msgstr ""
+#: g10/call-agent.c:170
msgid "Enter passphrase: "
-msgstr "請輸入密語: "
+msgstr ""
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
-#, fuzzy, c-format
-#| msgid "error creating keyring '%s': %s\n"
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
+#, c-format
msgid "error getting version from '%s': %s\n"
-msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
++#: g10/call-agent.c:211 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
-#, fuzzy, c-format
-#| msgid "%s does not yet work with %s\n"
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
++#, c-format
+ msgid "%s is not compliant with %s mode\n"
-msgstr "%s 還沒辦法跟 %s 一起運作\n"
++msgstr ""
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
-msgstr "沒有可用的 OpenPGP 卡片: %s\n"
+msgstr ""
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, 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/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: 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
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 ""
-
- #: 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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, 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:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
-msgstr "寫入 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/card-util.c:937
++#: g10/card-util.c:928
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 ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
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 ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
-msgstr "介面語言偏好設定: "
+msgstr ""
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
-msgstr "錯誤: 無效的偏好設定字串長度\n"
+msgstr ""
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
-msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
+msgstr ""
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)男性, (F)女性或留空): "
+msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
-msgstr "錯誤: 無效的回應.\n"
+msgstr ""
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
-msgstr "憑證中心 (CA) 指紋: "
+msgstr ""
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
-msgstr "錯誤: 無效的格式化指紋.\n"
+msgstr ""
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
-msgstr "不可能進行金鑰操作: %s\n"
+msgstr ""
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
-msgstr "這不是 OpenPGP 卡片"
+msgstr ""
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
-msgstr "取得現用金鑰資訊時出錯: %s\n"
+msgstr ""
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
-msgstr "是否要取代既有的金鑰? (y/N) "
+msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
-"請注意: 我們完全無法保證卡片支援你想用的尺寸.\n"
-" 如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
-" 看看這張卡片支援哪些尺寸.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
-msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
+msgstr ""
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
-msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
+msgstr ""
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
-msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
+msgstr ""
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
-msgstr "加大到 %u 位元\n"
+msgstr ""
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
+msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
-msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
+msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
-msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
+msgstr ""
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
+msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
-msgstr "請注意: 金鑰已經存放在卡片上了!\n"
+msgstr ""
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
-msgstr "是否要取代既有的金鑰? (y/N) "
+msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
" PIN = '%s' Admin PIN = '%s'\n"
"You should change them using the command --change-pin\n"
msgstr ""
-"請注意個人識別碼 (PIN) 的出廠設定值為\n"
-" PIN = '%s' 管理者 PIN = '%s'\n"
-"你應該用 --change-pin 指令來加以變更\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
-msgstr "請選擇你要產生的金鑰種類:\n"
+msgstr ""
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
-msgstr " (1) 簽署用金鑰\n"
+msgstr ""
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
-msgstr " (2) 加密用金鑰\n"
+msgstr ""
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
-msgstr " (3) 憑證用金鑰\n"
+msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "無效的選擇.\n"
+msgstr ""
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
-msgstr "請選擇要把金鑰存放在哪裡:\n"
+msgstr ""
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
-msgstr "KEYTOCARD 失敗: %s\n"
+msgstr ""
- #: g10/card-util.c:1782
-#, fuzzy
-#| msgid "This command is not allowed while in %s mode.\n"
++#: g10/card-util.c:1757
msgid "This command is not supported by this card\n"
-msgstr "在 %s 模式中不允許使用這個指令.\n"
+msgstr ""
- #: g10/card-util.c:1787
-#, fuzzy
-#| msgid "Note: keys are already stored on the card!\n"
++#: g10/card-util.c:1762
msgid "Note: This command destroys all keys stored on the card!\n"
-msgstr "請注意: 金鑰已經存放在卡片上了!\n"
+msgstr ""
- #: g10/card-util.c:1790
-#, fuzzy
-#| msgid "Continue? (Y/n) "
++#: g10/card-util.c:1765
msgid "Continue? (y/N) "
-msgstr "是否繼續? (Y/n) "
+msgstr ""
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
-msgstr "離開這個選單"
+msgstr ""
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
-msgstr "顯示管理者指令"
+msgstr ""
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
-msgstr "顯示這份線上說明"
+msgstr ""
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
-msgstr "列出所有可用的資料"
+msgstr ""
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
-msgstr "變更卡片持有人的名字"
+msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
-msgstr "變更取回金鑰的 URL"
+msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
-msgstr "從卡片 URL 取回指定的金鑰"
+msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
-msgstr "變更登入名稱"
+msgstr ""
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
-msgstr "變更介面語言偏好設定"
+msgstr ""
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
-msgstr "變更卡片持有者的性別"
+msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
-msgstr "變更某個憑證中心 (CA) 的指紋"
+msgstr ""
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
-msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
+msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
-msgstr "產生新的金鑰"
+msgstr ""
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
-msgstr "變更或重設個人識別碼 (PIN) 的選單"
+msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
-msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
+msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
-msgstr "用重設碼來解凍個人識別碼 (PIN)"
+msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
-msgstr "gpg/卡片> "
+msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
-msgstr "限管理者使用的指令\n"
+msgstr ""
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
-msgstr "允許使用管理者指令\n"
+msgstr ""
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
-msgstr "未允許使用管理者指令\n"
+msgstr ""
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
-msgstr "無效的指令 (試試看 \"help\")\n"
+msgstr ""
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
-msgstr "--output 在這個指令中沒有作用\n"
+msgstr ""
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, 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
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
-msgstr "建立密語時出錯: %s\n"
+msgstr ""
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
+msgstr ""
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
-msgstr "正在使用 %s 編密法\n"
+msgstr ""
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
-msgstr "'%s' 已經被壓縮了\n"
+msgstr ""
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
-msgstr "警告: '%s' 是個空檔案\n"
+msgstr ""
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
-msgstr "正在從 '%s' 讀取\n"
+msgstr ""
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/encrypt.c:708 g10/sign.c:996
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
++#: g10/encrypt.c:661 sm/encrypt.c:489
++#, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
++msgstr ""
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s 已加密給: \"%s\"\n"
+msgstr ""
- #: g10/encrypt.c:934 g10/pkclist.c:1029 g10/pkclist.c:1080
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+#, c-format
- msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
-msgstr "你不能夠將 %s 用於 %s 模式中\n"
+msgstr ""
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
-msgstr "%s 已加密的資料\n"
+msgstr ""
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
-msgstr "以 %d 未知演算法所加密\n"
+msgstr ""
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
+msgstr ""
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
-msgstr "處理已加密封包有問題\n"
+msgstr ""
+#: g10/exec.c:60
msgid "no remote program execution supported\n"
-msgstr "沒有支援的遠端程式執行\n"
+msgstr ""
+#: g10/exec.c:319
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
-msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
+msgstr ""
+#: g10/exec.c:349
msgid "this platform requires temporary files when calling external programs\n"
-msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
+msgstr ""
+#: g10/exec.c:427
#, c-format
msgid "unable to execute program '%s': %s\n"
-msgstr "無法執行程式 '%s': %s\n"
+msgstr ""
+#: g10/exec.c:430
#, c-format
msgid "unable to execute shell '%s': %s\n"
-msgstr "無法執行 shell '%s': %s\n"
+msgstr ""
+#: g10/exec.c:521
#, c-format
msgid "system error while calling external program: %s\n"
-msgstr "叫用外部程式時發生系統錯誤: %s\n"
+msgstr ""
+#: g10/exec.c:532 g10/exec.c:599
msgid "unnatural exit of external program\n"
-msgstr "外部程式不自然地離開\n"
+msgstr ""
+#: g10/exec.c:547
msgid "unable to execute external program\n"
-msgstr "無法執行外部程式\n"
+msgstr ""
+#: g10/exec.c:564
#, c-format
msgid "unable to read external program response: %s\n"
-msgstr "無法讀取外部程式回應: %s\n"
+msgstr ""
+#: g10/exec.c:610 g10/exec.c:617
#, c-format
msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "警告: 無法移除暫存檔 (%s) '%s': %s\n"
+msgstr ""
+#: g10/exec.c:622
#, c-format
msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
+msgstr ""
+#: g10/export.c:106
msgid "export signatures that are marked as local-only"
-msgstr "匯出標記為僅限本機使用的簽章"
+msgstr ""
+#: g10/export.c:108
msgid "export attribute user IDs (generally photo IDs)"
-msgstr "匯出署名使用者 ID (通常是照片 ID)"
+msgstr ""
+#: g10/export.c:110
msgid "export revocation keys marked as \"sensitive\""
-msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
+msgstr ""
+#: g10/export.c:112
msgid "remove unusable parts from key during export"
-msgstr "匯出時從金鑰中移除無法使用的部分"
+msgstr ""
+#: g10/export.c:114
msgid "remove as much as possible from key during export"
-msgstr "匯出時盡可能地從金鑰中移除"
+msgstr ""
+#: g10/export.c:120
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
-msgstr " - 已跳過"
+msgstr ""
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
-msgstr "正在寫入 '%s'\n"
+msgstr ""
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
-msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
+msgstr ""
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
-msgstr "不允許匯出私鑰\n"
+msgstr ""
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
+msgstr ""
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
-msgstr "警告: 沒有匯出任何東西\n"
+msgstr ""
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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 ""
-#, 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 ""
@@@ -2192,219 -1753,189 +2203,224 @@@ msgstr "
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, c-format
msgid "using subkey %s instead of primary key %s\n"
-msgstr "使用子鑰 %s 來替換主鑰 %s\n"
+msgstr ""
- #: g10/gpg.c:430 sm/gpgsm.c:200
-#, fuzzy, c-format
-#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/getkey.c:4336 g10/gpg.c:2063
++#, c-format
+ msgid "valid values for option '%s':\n"
-msgstr "選項 \"%.50s\" 的引數無效\n"
++msgstr ""
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
msgid "make a signature"
-msgstr "建立簽章"
+msgstr ""
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
-msgstr "建立明文簽章"
+msgstr ""
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
-msgstr "建立分離式簽章"
+msgstr ""
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
-msgstr "加密資料"
+msgstr ""
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
-msgstr "僅使用對稱式編密法來加密"
+msgstr ""
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
-msgstr "資料解密 (預設)"
+msgstr ""
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
-msgstr "驗證簽章"
+msgstr ""
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
-msgstr "列出金鑰"
+msgstr ""
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
-msgstr "列出金鑰和簽章"
+msgstr ""
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
-msgstr "列出並檢查金鑰簽章"
+msgstr ""
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
-msgstr "列出金鑰和指紋"
+msgstr ""
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
-msgstr "列出私鑰"
+msgstr ""
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
-msgstr "產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:458
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:461
msgid "quickly add a new user-id"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:463
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:466
msgid "quickly revoke a user-id"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:466
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:469
msgid "quickly set a new expiration date"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
-msgstr "全能金鑰對生成"
+msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
-msgstr "產生撤銷憑證"
+msgstr ""
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
-msgstr "從公鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
-msgstr "從私鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
-msgstr "快速簽署金鑰"
+msgstr ""
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
-msgstr "快速在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
-msgstr "簽署金鑰"
+msgstr ""
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
-msgstr "僅在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
-msgstr "簽署或編輯金鑰"
+msgstr ""
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
-msgstr "更改密語"
+msgstr ""
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
-msgstr "匯出金鑰"
+msgstr ""
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
-msgstr "把金鑰匯出至金鑰伺服器"
+msgstr ""
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
-msgstr "從金鑰伺服器匯入金鑰"
+msgstr ""
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
-msgstr "在金鑰伺服器上搜尋金鑰"
+msgstr ""
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
-msgstr "從金鑰伺服器更新所有的金鑰"
+msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
-msgstr "匯入/合併金鑰"
+msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
-msgstr "列印卡片狀態"
+msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
-msgstr "變更卡片上的資料"
+msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
-msgstr "變更卡片的個人識別碼 (PIN)"
+msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
-msgstr "更新信任資料庫"
+msgstr ""
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
-msgstr "印出訊息摘要"
+msgstr ""
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
-msgstr "以伺服器模式執行"
+msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
-msgstr "建立以 ASCII 封裝過的輸出"
+msgstr ""
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
+msgstr ""
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
+msgstr ""
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
+msgstr ""
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
-msgstr "使用標準的文字模式"
+msgstr ""
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
-msgstr "|檔案|將輸出寫入至指定檔案"
+msgstr ""
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
-msgstr "不要做任何改變"
+msgstr ""
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
-msgstr "覆寫前先詢問"
+msgstr ""
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
-msgstr "使用嚴謹的 OpenPGP 行為"
+msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-"@\n"
-"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:682
-#, 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:686
msgid ""
"@\n"
"Examples:\n"
@@@ -2415,558 -1946,442 +2431,540 @@@
" --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:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
+msgstr ""
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
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:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
-"\n"
-"已支援的演算法:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
-msgstr "公鑰: "
+msgstr ""
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
-msgstr "編密法: "
+msgstr ""
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
-msgstr "雜湊: "
+msgstr ""
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
-msgstr "壓縮: "
+msgstr ""
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
-msgstr "用法: %s [選項] %s\n"
+msgstr ""
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
-msgstr "指令彼此矛盾\n"
+msgstr ""
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
-msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
+msgstr ""
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
-msgstr "未知的組態項目 '%s'\n"
+msgstr ""
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
-msgstr "列出金鑰時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
-msgstr "列出金鑰時顯示金鑰用途資訊"
+msgstr ""
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
-msgstr "列出簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
-msgstr "列出簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
-msgstr "列出簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
-msgstr "列出簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
-msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
-msgstr "列出金鑰時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
+msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
-msgstr "在金鑰清單中顯示鑰匙圈名稱"
+msgstr ""
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
-msgstr "列出簽章時顯示有效期限"
+msgstr ""
- #: g10/gpg.c:2058 g10/gpg.c:2095
- #, c-format
- msgid "valid values for option '%s':\n"
- msgstr ""
-
- #: g10/gpg.c:2069
-#, fuzzy, c-format
-#| msgid "unknown option '%s'\n"
++#: g10/gpg.c:2074
+#, c-format
msgid "unknown TOFU policy '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2105 g10/keygen.c:168
- #, c-format
- msgid "invalid value for option '%s'\n"
- msgstr ""
-
- #: g10/gpg.c:2244
++#: g10/gpg.c:2227
#, c-format
msgid "Note: old default options file '%s' ignored\n"
-msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
-msgstr "請注意: 一般情況下不採用 %s!\n"
+msgstr ""
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
-msgstr "'%s' 不是有效的簽章使用期限\n"
+msgstr ""
- #: g10/gpg.c:3055
-#, fuzzy, c-format
-#| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3054
+#, c-format
msgid "\"%s\" is not a proper mail address\n"
-msgstr "第 %d 列: 不是有效的電子郵件地址\n"
+msgstr ""
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
-msgstr "無效的個人識別碼項目模式 '%s'\n"
+msgstr ""
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
-msgstr "'%s' 不是有效的字元集\n"
+msgstr ""
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
-msgstr "無法剖析金鑰伺服器 URL\n"
+msgstr ""
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: 無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: 無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
-msgstr "無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3201 g10/gpg.c:3216
-#, fuzzy, c-format
-#| msgid "invalid list options\n"
++#: g10/gpg.c:3200 g10/gpg.c:3215
+#, c-format
msgid "invalid filter option: %s\n"
-msgstr "無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: 無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
-msgstr "無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: 無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
-msgstr "無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
-msgstr "驗證簽章時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
-msgstr "驗證簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
-msgstr "驗證簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
-msgstr "驗證簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
-msgstr "驗證簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
-msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
-msgstr "驗證簽章時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
-msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
-msgstr "驗證簽章時祇顯示主要的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
-msgstr "以 PKA 資料驗證簽章"
+msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
-msgstr "提高對持有有效 PKA 資料之簽章的信任"
+msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: 無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
-msgstr "無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
-msgstr "無法把執行檔路徑設成 %s\n"
+msgstr ""
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: 無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
-msgstr "無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
-msgstr "警告: 程式可能會傾印出核心檔!\n"
+msgstr ""
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
-msgstr "警告: %s 會推翻 %s\n"
+msgstr ""
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "%s 不允許跟 %s 併用!\n"
+msgstr ""
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s 跟 %s 放在一起沒有意義!\n"
+msgstr ""
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
-msgstr "警告: 正在偽造的系統時間中執行: "
+msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
-msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
+msgstr ""
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
-msgstr "所選的編密演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
- msgid "selected digest algorithm is invalid\n"
- msgstr ""
-
- #: g10/gpg.c:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
-msgstr "所選的壓縮演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
-msgstr "所選的憑證摘要演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed 一定要大於 0\n"
+msgstr ""
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed 一定要大於 1\n"
+msgstr ""
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
+msgstr ""
- #: g10/gpg.c:3752
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
+msgstr ""
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
+msgstr ""
- #: g10/gpg.c:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
-msgstr "無效的預設偏好\n"
+msgstr ""
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
-msgstr "無效的個人編密法偏好\n"
+msgstr ""
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
-msgstr "無效的個人摘要偏好\n"
+msgstr ""
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
-msgstr "無效的個人壓縮偏好\n"
+msgstr ""
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s 還沒辦法跟 %s 一起運作\n"
+msgstr ""
- #: g10/gpg.c:3858
- #, c-format
- msgid "you may not use cipher algorithm '%s' while in %s mode\n"
- msgstr ""
-
- #: g10/gpg.c:3863
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+#, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3868
-#, fuzzy, c-format
-#| msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+#, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
-msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "信任資料庫啟始失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
+msgstr ""
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "'%s' 對稱式加密失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4088
-#, fuzzy, c-format
-#| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+#, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4148
-#, fuzzy, c-format
-#| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+#, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "送至金鑰伺服器失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "從金鑰伺服器接收失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4527
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4573
+#, c-format
msgid "export as ssh key failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "用金鑰伺服器搜尋失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "從金鑰伺服器更新失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
-msgstr "解開封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
-msgstr "進行封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
-msgstr "無效的雜湊演算法 '%s'\n"
+msgstr ""
- #: g10/gpg.c:4871 g10/tofu.c:2155
-#, fuzzy, c-format
-#| msgid "error loading certificate '%s': %s\n"
++#: g10/gpg.c:4917 g10/tofu.c:2154
+#, c-format
msgid "error parsing key specification '%s': %s\n"
-msgstr "載入憑證 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
-msgstr "請開始輸入你的訊息 ...\n"
+msgstr ""
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
-msgstr "給定的的憑證原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
-msgstr "給定的簽章原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
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
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
-msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
+msgstr ""
+#: g10/gpgv.c:89
msgid "|ALGO|reject signatures made with ALGO"
msgstr ""
@@@ -2979,337 -2392,282 +2977,341 @@@ msgid "
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
-"語法: gpgv [選項] [檔案]\n"
-"用已知的受信任金鑰來檢查簽章\n"
+#: g10/helptext.c:72
msgid "No help available"
-msgstr "沒有可用的說明"
+msgstr ""
+#: g10/helptext.c:82
#, c-format
msgid "No help available for '%s'"
-msgstr "'%s' 沒有可用的說明"
+msgstr ""
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
-msgstr "匯入標記為僅限本機使用的簽章"
+msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
-msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
+msgstr ""
- #: g10/import.c:158
-#, fuzzy
-#| msgid "do not update the trustdb after import"
++#: g10/import.c:166
msgid "do not clear the ownertrust values during import"
-msgstr "匯入後不要更新信任資料庫"
+msgstr ""
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
-msgstr "匯入後不要更新信任資料庫"
+msgstr ""
- #: g10/import.c:164
-#, fuzzy
-#| msgid "show key fingerprint"
++#: g10/import.c:172
msgid "show key during import"
-msgstr "顯示金鑰指紋"
+msgstr ""
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
-msgstr "祇接受既有金鑰的更新"
+msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
-msgstr "匯入後從金鑰中移除無法使用的部分"
+msgstr ""
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
-msgstr "匯入後盡可能地從金鑰中移除"
+msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
-#, fuzzy
-#| msgid "assume input is in binary format"
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
-msgstr "假設輸入的是二進制格式"
+msgstr ""
- #: g10/import.c:341 g10/import.c:584
-#, fuzzy
-#| msgid "show key fingerprint"
++#: g10/import.c:191
+ msgid "repair keys on import"
-msgstr "顯示金鑰指紋"
++msgstr ""
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
-msgstr "正在跳過 %d 型態的區塊\n"
+msgstr ""
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
-msgstr "目前已處理 %lu 把金鑰\n"
+msgstr ""
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
-msgstr "處理總量: %lu\n"
+msgstr ""
- #: g10/import.c:674
-#, fuzzy, c-format
-#| msgid " skipped new keys: %lu\n"
++#: g10/import.c:680
+#, c-format
msgid " skipped PGP-2 keys: %lu\n"
-msgstr " 已跳過的新金鑰: %lu\n"
+msgstr ""
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
-msgstr " 已跳過的新金鑰: %lu\n"
+msgstr ""
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
-msgstr " 沒有使用者的 ID: %lu\n"
+msgstr ""
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
-msgstr " 已匯入: %lu"
+msgstr ""
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
-msgstr " 未改變的: %lu\n"
+msgstr ""
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
-msgstr " 新的使用者 ID: %lu\n"
+msgstr ""
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
-msgstr " 新的子鑰: %lu\n"
+msgstr ""
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
-msgstr " 新的簽章: %lu\n"
+msgstr ""
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
-msgstr " 新的金鑰撤銷: %lu\n"
+msgstr ""
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
-msgstr " 已讀取的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
-msgstr " 已匯入的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
-msgstr " 未改變的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
-msgstr " 未被匯入: %lu\n"
+msgstr ""
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
-msgstr " 已清除的簽章: %lu\n"
+msgstr ""
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
-msgstr " 已清除的使用者 ID: %lu\n"
+msgstr ""
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
-msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
+msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
-msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
-msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
-msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
-msgstr "我們強烈建議你更新偏好設定, 並重新\n"
+msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
-msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
+msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
+msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
-msgstr "金鑰 %s: 沒有使用者 ID\n"
+msgstr ""
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
-msgstr "金鑰 %s: %s\n"
+msgstr ""
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
-msgstr "遭到匯入篩選程式駁回"
+msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
+msgstr ""
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
+msgstr ""
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
-msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
-msgstr "這可能肇因於遺失自我簽章所致\n"
+msgstr ""
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
-msgstr "金鑰 %s: 找不到公鑰: %s\n"
+msgstr ""
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
-msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
+msgstr ""
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
-msgstr "找不到可寫入的鑰匙圈: %s\n"
+msgstr ""
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
-msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
-msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
+msgstr ""
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
-msgstr "金鑰 %s: 跟我們的副本不吻合\n"
+msgstr ""
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
+msgstr ""
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
-msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
+msgstr ""
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
+msgstr ""
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
+msgstr ""
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
+msgstr ""
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
+msgstr ""
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
+msgstr ""
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
+msgstr ""
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
+msgstr ""
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
+msgstr ""
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
-msgstr "金鑰 %s: \"%s\" 未改變\n"
+msgstr ""
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
-msgstr "金鑰 %s: 私鑰已匯入\n"
+msgstr ""
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
-msgstr "金鑰 %s: 私鑰已存在\n"
+msgstr ""
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
-msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
+msgstr ""
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
-msgstr "私鑰 %s: %s\n"
+msgstr ""
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
-msgstr "未允許匯入私鑰\n"
+msgstr ""
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
+msgstr ""
#. TRANSLATORS: For smartcard, each private key on
#. host has a reference (stub) to a smartcard and
@@@ -3321,1268 -2679,1003 +3323,1222 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
+msgstr ""
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
+msgstr ""
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
+msgstr ""
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
-msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
+msgstr ""
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
+msgstr ""
- #: g10/import.c:2554
++#: g10/import.c:2815
#, 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
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
-msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+msgstr ""
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
-msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
+msgstr ""
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
-msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
+msgstr ""
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
-msgstr "金鑰 %s: 無效的附帶子鑰\n"
+msgstr ""
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
-msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
+msgstr ""
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
-msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
+msgstr ""
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
-msgstr "金鑰 %s: 無效的子鑰撤銷\n"
+msgstr ""
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
-msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
+msgstr ""
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
+msgstr ""
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
-msgstr "金鑰 %s: 子鑰已跳過\n"
+msgstr ""
- #: g10/import.c:2761
-# 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:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
+msgstr ""
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
+msgstr ""
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
+msgstr ""
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
+msgstr ""
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
+msgstr ""
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
+msgstr ""
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
+msgstr ""
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
+msgstr ""
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
+msgstr ""
- #: g10/import.c:3136
++#: g10/import.c:3399
#, 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
++#: g10/keyedit.c:260
msgid "[revocation]"
-msgstr "[撤銷]"
+msgstr ""
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
-msgstr "[自我簽章]"
+msgstr ""
- #: 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 ""
-
- #: g10/keyedit.c:633
- #, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr ""
-
- #: g10/keyedit.c:642
- #, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr ""
-
- #: g10/keyedit.c:805
- msgid " (reordered signatures follow)"
- msgstr ""
-
- #: g10/keyedit.c:918
- #, c-format
- msgid "key %s:\n"
- msgstr ""
-
- #: g10/keyedit.c:921
- #, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] ""
- msgstr[1] ""
-
- #: 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] ""
- msgstr[1] ""
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, c-format
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] ""
- msgstr[1] ""
-
- #: g10/keyedit.c:932
- #, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] ""
- msgstr[1] ""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
"(by looking at passports, checking fingerprints from different sources, "
"etc.)\n"
msgstr ""
-"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
-"(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
-msgstr " %d = 我勉強信任\n"
+msgstr ""
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
-msgstr " %d = 我完全信任\n"
+msgstr ""
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-"請輸入此信任簽章的深度.\n"
-"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
-"同時也信任這把金鑰所簽署的信任簽章.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
+msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
-msgstr "使用者 ID \"%s\" 已撤銷."
+msgstr ""
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "你仍然想要簽署它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
-msgstr " 無法簽署.\n"
+msgstr ""
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
-msgstr "使用者 ID \"%s\" 已過期."
+msgstr ""
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
-msgstr "使用者 ID \"%s\" 未經自我簽署."
+msgstr ""
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
-msgstr "使用者 ID \"%s\" 可被簽署."
+msgstr ""
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
-msgstr "是否要簽署? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
-"\"%s\" 裡的自我簽章\n"
-"是 PGP 2.x 型態的簽章.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr ""
-"你目前在 \"%s\" 的簽章\n"
-"已經過期了.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
-"你目前在 \"%s\" 的簽章\n"
-"是一份本機簽章.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
+msgstr ""
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
+msgstr ""
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "你仍然想要再次簽署它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
-msgstr "沒有東西可以讓金鑰 %s 簽署\n"
+msgstr ""
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
-msgstr "這把金鑰已經過期了!"
+msgstr ""
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
-msgstr "這把金鑰將在 %s 過期.\n"
+msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
+msgstr ""
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
-"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
-"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
-msgstr " (0) 我不作答.%s\n"
+msgstr ""
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
-msgstr " (1) 我根本沒有檢查過.%s\n"
+msgstr ""
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
-msgstr " (2) 我隨意檢查過了.%s\n"
+msgstr ""
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
-msgstr " (3) 我非常小心地檢查過了.%s\n"
+msgstr ""
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
-msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
+msgstr ""
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr ""
-"你真的確定要用你的金鑰 \"%s\" (%s)\n"
-"來簽署這把金鑰嗎\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
-msgstr "這將會是一份自我簽章.\n"
+msgstr ""
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
+msgstr ""
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
-msgstr "這份簽章會被標記成不可匯出.\n"
+msgstr ""
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
-msgstr "這份簽章會被標記成不可撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
-msgstr "我根本沒有檢查過這把金鑰.\n"
+msgstr ""
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
-msgstr "我隨意檢查過這把金鑰了.\n"
+msgstr ""
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
-msgstr "我非常小心地檢查過這把金鑰了.\n"
+msgstr ""
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
-msgstr "真的要簽署嗎? (y/N)"
+msgstr ""
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
-msgstr "簽署時失敗: %s\n"
+msgstr ""
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
+msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
-msgstr "金鑰 %s: 變更密語時出錯: %s\n"
+msgstr ""
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
-msgstr "儲存並離開"
+msgstr ""
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
-msgstr "顯示金鑰指紋"
+msgstr ""
- #: g10/keyedit.c:1878
-#, fuzzy
-#| msgid "Enter the keygrip: "
++#: g10/keyedit.c:1264
msgid "show the keygrip"
-msgstr "請輸入金鑰鑰柄: "
+msgstr ""
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
-msgstr "列出金鑰和使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
-msgstr "選擇使用者 ID N"
+msgstr ""
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
-msgstr "選擇子鑰 N"
+msgstr ""
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
-msgstr "檢查簽章"
+msgstr ""
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
-msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
+msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
-msgstr "僅在本機簽署所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
-msgstr "用信任簽章來簽署所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
-msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
-msgstr "增加使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
-msgstr "增加照片 ID"
+msgstr ""
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
-msgstr "刪除所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
-msgstr "增加子鑰"
+msgstr ""
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
-msgstr "將金鑰加到智慧卡"
+msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
-msgstr "將金鑰移動到智慧卡"
+msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
-msgstr "將備份金鑰移動到智慧卡"
+msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
-msgstr "刪除所選的子鑰"
+msgstr ""
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
-msgstr "增加撤銷金鑰"
+msgstr ""
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
-msgstr "從所選的使用者 ID 中刪除簽章"
+msgstr ""
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
-msgstr "變更金鑰或所選子鑰的使用期限"
+msgstr ""
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
-msgstr "把所選的使用者 ID 標為主要"
+msgstr ""
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
-msgstr "列出偏好 (專家模式)"
+msgstr ""
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
-msgstr "列出偏好 (囉唆模式)"
+msgstr ""
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
-msgstr "設定所選使用者 ID 的偏好清單"
+msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
-msgstr "為所選的使用者 ID 設定註記"
+msgstr ""
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
-msgstr "更改密語"
+msgstr ""
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
-msgstr "更改主觀信任"
+msgstr ""
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
-msgstr "撤銷所選使用者 ID 的簽章"
+msgstr ""
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
-msgstr "撤銷所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
-msgstr "撤銷金鑰或所選的子鑰"
+msgstr ""
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
-msgstr "啟用金鑰"
+msgstr ""
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
-msgstr "停用金鑰"
+msgstr ""
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
-msgstr "顯示所選的照片 ID"
+msgstr ""
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
+msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
-msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
+msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
-msgstr "私鑰可用.\n"
+msgstr ""
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
-msgstr "要有私鑰纔能這麼做.\n"
+msgstr ""
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
" a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
-"* 這個 'sign' 指令也可以在前面加上一個 'l' 字母, 來表示本機簽章 (lsign),\n"
-" 加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
-" (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
-msgstr "金鑰已撤銷."
+msgstr ""
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
-msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2273
-#, fuzzy
-#| msgid "Really sign all user IDs? (y/N) "
++#: g10/keyedit.c:1659
msgid "Really sign all text user IDs? (y/N) "
-msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
-msgstr "提示: 選擇使用者 ID 來加以簽署\n"
+msgstr ""
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
-msgstr "未知的簽章種類 '%s'\n"
+msgstr ""
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
-msgstr "在 %s 模式中不允許使用這個指令.\n"
+msgstr ""
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
-msgstr "你至少得選擇一個使用者 ID.\n"
+msgstr ""
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
-msgstr "你不能刪除最後一個使用者 ID!\n"
+msgstr ""
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
-msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
-msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
+msgstr ""
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
-msgstr "真的要移動主鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
-msgstr "你一定祇得選擇一把金鑰.\n"
+msgstr ""
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
-msgstr "這項指令要拿一個檔名來當作引數\n"
+msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
-msgstr "無法開啟 '%s': %s\n"
+msgstr ""
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
-msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
+msgstr ""
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
-msgstr "你至少得選擇一把金鑰.\n"
+msgstr ""
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
-msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
-msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
-msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
+msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
-msgstr "設定偏好清單至:\n"
+msgstr ""
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
-msgstr "真的要更新偏好設定嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
-msgstr "要儲存變更嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
-msgstr "要不儲存就離開嗎? (y/N) "
+msgstr ""
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
-msgstr "更新失敗: %s\n"
+msgstr ""
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
-msgstr "金鑰沒有變更所以不需要更新.\n"
+msgstr ""
- #: g10/keyedit.c:3046
-#, fuzzy
-#| msgid "You can't delete the last user ID!\n"
++#: g10/keyedit.c:2432
msgid "cannot revoke the last valid user ID.\n"
-msgstr "你不能刪除最後一個使用者 ID!\n"
+msgstr ""
- #: g10/keyedit.c:3072
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
++#: g10/keyedit.c:2458
+#, c-format
msgid "revoking the user ID failed: %s\n"
-msgstr "檢查信任清單時失敗: %s\n"
+msgstr ""
- #: g10/keyedit.c:3136
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
++#: g10/keyedit.c:2522
+#, c-format
msgid "setting the primary user ID failed: %s\n"
-msgstr "檢查信任清單時失敗: %s\n"
+msgstr ""
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
-msgstr "\"%s\" 不是指紋\n"
+msgstr ""
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
-msgstr "\"%s\" 不是主要指紋\n"
+msgstr ""
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
-#, fuzzy, c-format
-#| msgid "invalid value\n"
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
+#, c-format
msgid "Invalid user ID '%s': %s\n"
-msgstr "無效的數值\n"
+msgstr ""
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
-msgstr "沒有相符的使用者 ID."
+msgstr ""
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
-msgstr "沒有東西可以簽署.\n"
+msgstr ""
- #: g10/keyedit.c:3471
-#, fuzzy, c-format
-#| msgid "'%s' is not a valid signature expiration\n"
++#: g10/keyedit.c:2862
+#, c-format
msgid "'%s' is not a valid expiration time\n"
-msgstr "'%s' 不是有效的簽章使用期限\n"
+msgstr ""
- #: g10/keyedit.c:3591
-#, fuzzy, c-format
-#| msgid "\"%s\" is not a fingerprint\n"
++#: g10/keyedit.c:2905
++#, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
-msgstr "\"%s\" 不是指紋\n"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found: %s\n"
++#: g10/keyedit.c:2929
++#, c-format
+ msgid "subkey \"%s\" not found\n"
-msgstr "找不到金鑰 \"%s\": %s\n"
++msgstr ""
+
++#: g10/keyedit.c:3052
msgid "Digest: "
-msgstr "摘要: "
+msgstr ""
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
-msgstr "特點: "
+msgstr ""
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
-msgstr "金鑰伺服器無修改"
+msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
-msgstr "偏好的金鑰伺服器: "
+msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
-msgstr "註記: "
+msgstr ""
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
+msgstr ""
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
-msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
+msgstr ""
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
-msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
+msgstr ""
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
-msgstr "(機密)"
+msgstr ""
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
-msgstr "建立: %s"
+msgstr ""
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
-msgstr "撤銷: %s"
+msgstr ""
- #: g10/keyedit.c:4077 g10/keylist.c:1894
-# of subkey
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
-msgstr "過期: %s"
+msgstr ""
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
-# of subkey
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
-msgstr "到期: %s"
+msgstr ""
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
-msgstr "用途: %s"
+msgstr ""
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
-msgstr "卡片編號: "
+msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
-msgstr "信任: %s"
+msgstr ""
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
-msgstr "有效性: %s"
+msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
-msgstr "這把金鑰已經停用了"
+msgstr ""
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
-msgstr "已過期"
+msgstr ""
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
-" 導致不同的使用者 ID 被當成主要 ID.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
-msgstr "警告: 你的加密子鑰很快將到期.\n"
+msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
-msgstr "你可能也會想變更其使用期限.\n"
+msgstr ""
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
-"警告: 這是一把 PGP2 型態的金鑰.\n"
-" 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
-msgstr "你確定仍然想要增加嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
+msgstr ""
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
-msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
+msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
-msgstr "刪除這份完好的簽章嗎? (y/N/q)"
+msgstr ""
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
-msgstr "刪除這份無效的簽章嗎? (y/N/q)"
+msgstr ""
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
-msgstr "刪除這份未知的簽章嗎? (y/N/q)"
+msgstr ""
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
-msgstr "真的要刪除這份自我簽章嗎? (y/N)"
+msgstr ""
- #: g10/keyedit.c:4629
-#, fuzzy, c-format
-#| msgid "Deleted %d signature.\n"
++#: g10/keyedit.c:4090
+#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
-msgstr[0] "已經刪除了 %d 份簽章.\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
-msgstr "沒有刪除任何東西.\n"
+msgstr ""
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
-msgstr "無效"
+msgstr ""
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
-msgstr "使用者 ID \"%s\" 已精簡: %s\n"
+msgstr ""
- #: g10/keyedit.c:4676
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:4137
+#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
-msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
-msgstr "使用者 ID \"%s\": 已經最小化了\n"
+msgstr ""
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
-msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
+msgstr ""
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
" some versions of PGP to reject this key.\n"
msgstr ""
-"警告: 這是一把 PGP2 型態的金鑰.\n"
-" 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
+msgstr ""
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
-msgstr "輸入指定撤銷者的使用者 ID: "
+msgstr ""
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
+msgstr ""
- #: g10/keyedit.c:4822
-# This actually causes no harm (after all, a key that
-# designates itself as a revoker is the same as a
-# regular key), but it's easy enough to check.
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
+msgstr ""
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
-msgstr "已指定這把金鑰為撤銷者了\n"
+msgstr ""
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
+msgstr ""
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:4932
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
++#: g10/keyedit.c:4397
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
-msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
-msgstr "正在變更子鑰的使用期限.\n"
+msgstr ""
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
-msgstr "正在變更主鑰的使用期限.\n"
+msgstr ""
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
-msgstr "你不能變更 v3 金鑰的使用期限\n"
+msgstr ""
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
-msgstr "簽署子鑰 %s 已經交叉認證過了\n"
+msgstr ""
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
-msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
+msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
-msgstr "請祇選擇一個使用者 ID.\n"
+msgstr ""
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
+msgstr ""
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
-msgstr "請輸入你的偏好金鑰伺服器 URL: "
+msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
-msgstr "你確定要取代它嗎？ (y/N) "
+msgstr ""
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
-msgstr "你確定要刪除它嗎？ (y/N) "
+msgstr ""
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
-msgstr "請輸入註記: "
+msgstr ""
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
-msgstr "是否繼續? (y/N) "
+msgstr ""
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
-msgstr "索引 %d 沒有對應到使用者 ID\n"
+msgstr ""
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
-msgstr "雜湊 %s 沒有對應到使用者 ID\n"
+msgstr ""
- #: g10/keyedit.c:6028
-#, fuzzy, c-format
-#| msgid "No subkey with index %d\n"
++#: g10/keyedit.c:5495
+#, c-format
msgid "No subkey with key ID '%s'.\n"
-msgstr "索引 %d 沒有對應到子鑰\n"
+msgstr ""
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
-msgstr "索引 %d 沒有對應到子鑰\n"
+msgstr ""
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
-msgstr "使用者 ID: \"%s\"\n"
+msgstr ""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
-msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
+msgstr ""
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
-msgstr " (不可匯出)"
+msgstr ""
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
-msgstr "這份簽章已經在 %s 過期了.\n"
+msgstr ""
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "你確定仍然想要撤銷它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
-msgstr "並非由你所簽署.\n"
+msgstr ""
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
-msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
+msgstr ""
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
-msgstr " (不可撤銷)"
+msgstr ""
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
-msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
+msgstr ""
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
-msgstr "你正要撤銷這些簽章:\n"
+msgstr ""
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
-msgstr "真的要建立撤銷憑證嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
-msgstr "沒有私鑰\n"
+msgstr ""
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
-msgstr "使用者 ID \"%s\" 已撤銷\n"
+msgstr ""
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
+msgstr ""
- #: g10/keyedit.c:6558
-#, fuzzy
-#| msgid "You can't delete the last user ID!\n"
++#: g10/keyedit.c:6025
msgid "Cannot revoke the last valid user ID.\n"
-msgstr "你不能刪除最後一個使用者 ID!\n"
+msgstr ""
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
-msgstr "金鑰 %s 已撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
-msgstr "子鑰 %s 已撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/keygen.c:168
++#, c-format
+ msgid "invalid value for option '%s'\n"
-msgstr "選項 \"%.50s\" 的引數無效\n"
++msgstr ""
+
+#: g10/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
-msgstr "偏好設定 '%s' 重複了\n"
+msgstr ""
+#: g10/keygen.c:324
msgid "too many cipher preferences\n"
-msgstr "編密偏好過多\n"
+msgstr ""
+#: g10/keygen.c:326
msgid "too many digest preferences\n"
-msgstr "摘要偏好過多\n"
+msgstr ""
+#: g10/keygen.c:328
msgid "too many compression preferences\n"
-msgstr "壓縮偏好過多\n"
+msgstr ""
+#: g10/keygen.c:471
#, c-format
msgid "invalid item '%s' in preference string\n"
-msgstr "偏好字串中含有無效的項目 '%s'\n"
+msgstr ""
+#: g10/keygen.c:950
msgid "writing direct signature\n"
-msgstr "寫入直接簽章中\n"
+msgstr ""
+#: g10/keygen.c:996
msgid "writing self signature\n"
-msgstr "寫入自我簽章中\n"
+msgstr ""
+#: g10/keygen.c:1053
msgid "writing key binding signature\n"
-msgstr "寫入附鑰簽章中\n"
+msgstr ""
+#: 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 "金鑰尺寸無效; 改用 %u 位元\n"
+msgstr ""
+#: 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 "金鑰尺寸增大到 %u 位元\n"
+msgstr ""
+#: g10/keygen.c:1520
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
-msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
+msgstr ""
+#: g10/keygen.c:1694
msgid "Sign"
-msgstr "簽署"
+msgstr ""
+#: g10/keygen.c:1697
msgid "Certify"
-msgstr "保證"
+msgstr ""
+#: g10/keygen.c:1700
msgid "Encrypt"
-msgstr "加密"
+msgstr ""
+#: g10/keygen.c:1703
msgid "Authenticate"
-msgstr "鑑定"
+msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
#. translation. If this is not possible use single digits. The
@@@ -4915,217 -3971,194 +4871,231 @@@ msgid "
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
msgstr ""
-"我們需要產生大量的隨機位元組. 這個時候你可以多做一些事情\n"
-"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
-"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
-msgstr "產生金鑰失敗: %s\n"
+msgstr ""
+#: g10/keygen.c:3912
#, c-format
msgid ""
"About to create a key for:\n"
" \"%s\"\n"
"\n"
msgstr ""
-"即將建立用於此之金鑰:\n"
-" \"%s\"\n"
-"\n"
+#: g10/keygen.c:3914
msgid "Continue? (Y/n) "
-msgstr "是否繼續? (Y/n) "
+msgstr ""
+#: g10/keygen.c:3935
#, c-format
msgid "A key for \"%s\" already exists\n"
-msgstr "\"%s\" 的金鑰已存在\n"
+msgstr ""
+#: g10/keygen.c:3940
msgid "Create anyway? (y/N) "
-msgstr "無論如何還是要建立嗎? (y/N) "
+msgstr ""
+#: g10/keygen.c:3946
msgid "creating anyway\n"
-msgstr "總之還是在建立\n"
+msgstr ""
+#: g10/keygen.c:4334
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
-msgstr "請注意: 如需全能金鑰產生對話框請用 \"%s %s\".\n"
+msgstr ""
+#: g10/keygen.c:4377
msgid "Key generation canceled.\n"
-msgstr "金鑰產生已取消.\n"
+msgstr ""
+#: g10/keygen.c:4437
#, c-format
msgid "can't create backup file '%s': %s\n"
-msgstr "無法建立備份檔案 '%s': %s\n"
+msgstr ""
+#: g10/keygen.c:4457
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
-msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
+msgstr ""
+#: g10/keygen.c:4611 g10/keygen.c:4767
#, c-format
msgid "writing public key to '%s'\n"
-msgstr "正在寫入公鑰至 '%s'\n"
+msgstr ""
+#: g10/keygen.c:4761
#, c-format
msgid "no writable public keyring found: %s\n"
-msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
+msgstr ""
+#: g10/keygen.c:4775
#, c-format
msgid "error writing public keyring '%s': %s\n"
-msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keygen.c:4808
msgid "public and secret key created and signed.\n"
-msgstr "公鑰和私鑰已建立及簽署.\n"
+msgstr ""
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
-"來產生加密用的子鑰.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+msgstr ""
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+msgstr ""
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
+msgstr ""
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
-msgstr "主鑰的私鑰部分無法取用.\n"
+msgstr ""
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "主鑰的私鑰部分存放於卡上.\n"
+msgstr ""
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
-msgstr "真的要建立嗎? (y/N) "
+msgstr ""
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
-msgstr "永遠不過期"
+msgstr ""
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
-msgstr "關鍵簽章原則: "
+msgstr ""
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
-msgstr "簽章原則: "
+msgstr ""
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
-msgstr "執意偏好的金鑰伺服器: "
+msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
-msgstr "關鍵簽章註記: "
+msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
-msgstr "簽章註記: "
+msgstr ""
- #: g10/keylist.c:473
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
++#: g10/keylist.c:474
+#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
-msgstr[0] "%d 份損壞的簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keylist.c:486
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
++#: g10/keylist.c:478
++#, 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 "1 signature not checked due to a missing key\n"
++#: g10/keylist.c:482
++#, 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 "1 signature not checked due to an error\n"
++#: g10/keylist.c:487
+#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keylist.c:568
-#, fuzzy, c-format
-#| msgid "Warning: %lu key(s) skipped due to their large size\n"
++#: g10/keylist.c:569
+#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
-msgstr[0] "警告: %lu 把金鑰因尺寸太大已跳過\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
-msgstr "鑰匙圈"
+msgstr ""
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
-msgstr " 主鑰指紋:"
+msgstr ""
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
-msgstr " 子鑰指紋:"
+msgstr ""
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
-msgstr " 主鑰指紋:"
+msgstr ""
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
-msgstr " 子鑰指紋:"
+msgstr ""
- #: g10/keylist.c:1772 g10/keylist.c:1788
-# use tty
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
-msgstr " 金鑰指紋 ="
+msgstr ""
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
-msgstr " 卡片序號 ="
+msgstr ""
+#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
-msgstr "快取鑰匙圈 '%s' 中\n"
+msgstr ""
-#, 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] ""
-#, 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] ""
-#, 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: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,512 -4171,413 +5111,517 @@@ 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
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
-msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
+msgstr ""
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
-msgstr "正在請求金鑰 %s 自 %s\n"
+msgstr ""
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
-#, fuzzy
-#| msgid "invalid keyserver options\n"
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
msgid "no keyserver known\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
-msgstr "已跳過 \"%s\": %s\n"
+msgstr ""
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
-msgstr "遞送金鑰 %s 至 %s\n"
+msgstr ""
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
-msgstr "正在向 '%s' 請求金鑰\n"
+msgstr ""
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "警告: 無法抓取 URI %s: %s\n"
+msgstr ""
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
-msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
+msgstr ""
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
-msgstr "%s 加密過的階段金鑰\n"
+msgstr ""
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "密語係以未知的 %d 摘要演算法所產生\n"
+msgstr ""
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
-msgstr "公鑰為 %s\n"
+msgstr ""
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
-msgstr "公鑰加密過的資料: 完好的 DEK\n"
+msgstr ""
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, 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
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
-msgstr " \"%s\"\n"
+msgstr ""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
-msgstr "已用 %s 金鑰, ID %s 所加密\n"
+msgstr ""
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
-msgstr "公鑰解密失敗: %s\n"
+msgstr ""
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
-msgstr "已用 %lu 個密語加密了\n"
+msgstr ""
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
-msgstr "已用 1 個密語加密了\n"
+msgstr ""
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
-msgstr "假定 %s 為加密過的資料\n"
+msgstr ""
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, 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
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
-msgstr "警告: 訊息未受到完整的保護\n"
+msgstr ""
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
-msgstr "解密成功\n"
+msgstr ""
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "警告: 加密過的訊息已經被變造了!\n"
+msgstr ""
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
-msgstr "解密失敗: %s\n"
+msgstr ""
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
-msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
+msgstr ""
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
-msgstr "原始的檔名 ='%.*s'\n"
+msgstr ""
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
-msgstr "警告: 看到了多份明文\n"
+msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
+msgstr ""
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
-msgstr "找不到簽章\n"
+msgstr ""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
-msgstr "*損壞* 的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
-msgstr "過期的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
-msgstr "完好的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
-msgstr "簽章驗證已抑制\n"
+msgstr ""
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
-msgstr "無法處理這個不明確的簽章資料\n"
+msgstr ""
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
-msgstr "由 %s 建立的簽章\n"
+msgstr ""
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
-msgstr " 使用 %s 金鑰 %s\n"
+msgstr ""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
-msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
+msgstr ""
- #: g10/mainproc.c:1765
-#, fuzzy, c-format
-#| msgid " aka \"%s\""
++#: g10/mainproc.c:1808
+#, c-format
msgid " issuer \"%s\"\n"
-msgstr " 亦即 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
-msgstr "可用的金鑰於: "
+msgstr ""
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
-msgstr "[ 不確定 ]"
+msgstr ""
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
-msgstr " 亦即 \"%s\""
+msgstr ""
- #: g10/mainproc.c:2138
-#, fuzzy, c-format
-#| msgid "WARNING: This key is not certified with a trusted signature!\n"
++#: g10/mainproc.c:2176
++#, c-format
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
-msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
++msgstr ""
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
-msgstr "這份簽署已經在 %s 過期了\n"
+msgstr ""
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
-msgstr "這份簽署將在 %s 到期\n"
+msgstr ""
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
+msgstr ""
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
-msgstr "二進制"
+msgstr ""
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
-msgstr "文字模式"
+msgstr ""
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
-msgstr "未知"
+msgstr ""
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
-msgstr ", 金鑰演算法 "
+msgstr ""
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
-msgstr "無法檢查簽章: %s\n"
+msgstr ""
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
-msgstr "不是一份分離的簽章\n"
+msgstr ""
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
-msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
+msgstr ""
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
-msgstr "等級 0x%02x 的獨立簽章\n"
+msgstr ""
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
-msgstr "舊型 (PGP 2.x) 簽章\n"
+msgstr ""
+#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
-msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
+msgstr ""
+#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
-msgstr "fstat(%d) 失敗於 %s: %s\n"
+msgstr ""
+#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
+msgstr ""
+#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
+msgstr ""
+#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
+msgstr ""
+#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
+msgstr ""
+#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "警告: 已不建議使用 %s 摘要演算法\n"
+msgstr ""
+#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "%s:%u: read error: %s\n"
+#: g10/misc.c:375
+#, c-format
msgid "(reported error: %s)\n"
-msgstr "%s:%u: 讀取錯誤: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "read error in '%s': %s\n"
+#: g10/misc.c:378
+#, c-format
msgid "(reported error: %s <%s>)\n"
-msgstr "'%s' 讀取錯誤: %s\n"
+msgstr ""
+#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
+msgstr ""
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告: 已不建議使用 \"%s\" 選項\n"
+msgstr ""
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
-msgstr "請改以 \"%s%s\" 代替\n"
+msgstr ""
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
+msgstr ""
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
-msgstr "未壓縮"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
-msgstr "uncompressed|none|未壓縮|無"
+msgstr ""
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
-msgstr "這個訊息對 %s 來說無法使用\n"
+msgstr ""
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
-msgstr "不明確的選項 '%s'\n"
+msgstr ""
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
- #: g10/misc.c:1826
++#: g10/misc.c:1720
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:1848
-#, fuzzy, c-format
-#| msgid "Unknown signature type '%s'\n"
++#: g10/misc.c:1742
+#, c-format
msgid "unknown weak digest '%s'\n"
-msgstr "未知的簽章種類 '%s'\n"
+msgstr ""
+#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
-msgstr "檔案 '%s' 已存在. "
+msgstr ""
+#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
-msgstr "是否覆寫? (y/N) "
+msgstr ""
+#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
-msgstr "%s: 未知的副檔名\n"
+msgstr ""
+#: g10/openfile.c:141
msgid "Enter new filename"
-msgstr "請輸入新的檔名"
+msgstr ""
+#: g10/openfile.c:212
msgid "writing to stdout\n"
-msgstr "寫到標準輸出中\n"
+msgstr ""
+#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
-msgstr "假設被簽署的資料在 '%s'\n"
+msgstr ""
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
-msgstr "無法操作 %d 公開金鑰演算法\n"
+msgstr ""
+#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
+msgstr ""
+#: 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"
@@@ -5958,154 -4853,128 +5933,159 @@@ msgid "
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-"\n"
-"請輸入使用者 ID. 以空白列結束: "
+#: g10/pkclist.c:1186
msgid "No such user ID.\n"
-msgstr "沒有這個使用者 ID.\n"
+msgstr ""
+#: g10/pkclist.c:1197 g10/pkclist.c:1274
msgid "skipped: public key already set as default recipient\n"
-msgstr "已跳過: 公鑰已經被設成預設收件者\n"
+msgstr ""
+#: g10/pkclist.c:1219
msgid "Public key is disabled.\n"
-msgstr "公鑰已停用.\n"
+msgstr ""
+#: g10/pkclist.c:1229
msgid "skipped: public key already set\n"
-msgstr "已跳過: 公鑰已設過\n"
+msgstr ""
+#: g10/pkclist.c:1264
#, c-format
msgid "unknown default recipient \"%s\"\n"
-msgstr "未知的預設收件者 \"%s\"\n"
+msgstr ""
+#: g10/pkclist.c:1313
msgid "no valid addressees\n"
-msgstr "沒有有效的地址\n"
+msgstr ""
+#: g10/pkclist.c:1666
#, c-format
msgid "Note: key %s has no %s feature\n"
-msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
+msgstr ""
+#: g10/pkclist.c:1691
#, c-format
msgid "Note: key %s has no preference for %s\n"
-msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
+msgstr ""
+#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
+msgstr ""
+#: g10/plaintext.c:614
msgid "Detached signature.\n"
-msgstr "分離的簽章.\n"
+msgstr ""
+#: g10/plaintext.c:622
msgid "Please enter name of data file: "
-msgstr "請輸入資料檔的名稱: "
+msgstr ""
+#: g10/plaintext.c:659
msgid "reading stdin ...\n"
-msgstr "正在讀取標準輸入中 ...\n"
+msgstr ""
+#: g10/plaintext.c:704
msgid "no signed data\n"
-msgstr "沒有被簽署過的資料\n"
+msgstr ""
+#: g10/plaintext.c:722
#, c-format
msgid "can't open signed data '%s'\n"
-msgstr "無法開啟被簽署過的資料 '%s'\n"
+msgstr ""
+#: g10/plaintext.c:757
#, c-format
msgid "can't open signed data fd=%d: %s\n"
-msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
+msgstr ""
- #: g10/pubkey-enc.c:116
-#, fuzzy, c-format
-#| msgid "certificate is not usable for encryption\n"
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
++#, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
-msgstr "憑證無法用於加密\n"
++msgstr ""
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
+msgstr ""
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
-msgstr "很好, 我們就是匿名收件者.\n"
+msgstr ""
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
-msgstr "不支援舊式的 DEK 編碼\n"
+msgstr ""
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "%d%s 編密演算法未知或已停用\n"
+msgstr ""
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
+msgstr ""
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
-msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
+msgstr ""
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
-msgstr "請注意: 金鑰已撤銷"
+msgstr ""
+#: 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 失敗: %s\n"
+msgstr ""
+#: g10/revoke.c:143
#, c-format
msgid "key %s has no user IDs\n"
-msgstr "金鑰 %s 沒有使用者 ID\n"
+msgstr ""
+#: g10/revoke.c:311
msgid "To be revoked by:\n"
-msgstr "將被撤銷:\n"
+msgstr ""
+#: g10/revoke.c:315
msgid "(This is a sensitive revocation key)\n"
-msgstr "(這是把機密的撤銷金鑰)\n"
+msgstr ""
-#, fuzzy
-#| msgid "Secret key is available.\n"
+#: g10/revoke.c:321
msgid "Secret key is not available.\n"
-msgstr "私鑰可用.\n"
+msgstr ""
+#: g10/revoke.c:326
msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
+msgstr ""
+#: g10/revoke.c:335 g10/revoke.c:729
msgid "ASCII armored output forced.\n"
-msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
+msgstr ""
+#: g10/revoke.c:351 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
-msgstr "make_keysig_packet 失敗: %s\n"
+msgstr ""
+#: g10/revoke.c:414
msgid "Revocation certificate created.\n"
-msgstr "已建立撤銷憑證.\n"
+msgstr ""
+#: g10/revoke.c:420
#, c-format
msgid "no revocation keys found for \"%s\"\n"
-msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
+msgstr ""
+#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
+msgstr ""
+#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
@@@ -6165,720 -5047,609 +6145,725 @@@ msgid "
"your media become unreadable. But have some caution: The print system of\n"
"your machine might store the data and make it available to others!\n"
msgstr ""
-"已建立撤銷憑證.\n"
-"\n"
-"請把這個檔案搬移到另一個你能夠將之藏起來的媒介上;\n"
-"如果有人能夠取得這份憑證的話, 那麼他也能夠讓你的\n"
-"金鑰無法繼續使用. 把這份憑證列印出來再藏到別的地\n"
-"方也是很好的方法, 以免你的儲存媒介損毀而無法讀取.\n"
-"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
-"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
+#: g10/revoke.c:771
msgid "Please select the reason for the revocation:\n"
-msgstr "請選擇撤銷的原因:\n"
+msgstr ""
+#: g10/revoke.c:781
msgid "Cancel"
-msgstr "取消"
+msgstr ""
+#: g10/revoke.c:783
#, c-format
msgid "(Probably you want to select %d here)\n"
-msgstr "(也許你會想要在這裡選擇 %d)\n"
+msgstr ""
+#: g10/revoke.c:824
msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "請輸入選用的描述; 以空白列結束:\n"
+msgstr ""
+#: g10/revoke.c:852
#, c-format
msgid "Reason for revocation: %s\n"
-msgstr "撤銷原因: %s\n"
+msgstr ""
+#: g10/revoke.c:854
msgid "(No description given)\n"
-msgstr "(沒有給定描述)\n"
+msgstr ""
+#: g10/revoke.c:859
msgid "Is this okay? (y/N) "
-msgstr "這樣可以嗎? (y/N) "
+msgstr ""
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
-msgstr "建立了弱金鑰 - 重試中\n"
+msgstr ""
+#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
+msgstr ""
+#: g10/seskey.c:306
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
-msgstr "%s 金鑰 %s 使用不安全 (%zu 位元) 的雜湊\n"
+msgstr ""
+#: g10/seskey.c:324
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
-msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
+msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
-msgstr "警告: 簽章摘要與訊息不一致\n"
+msgstr ""
- #: g10/sig-check.c:171
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
++#, c-format
+ msgid "key %s may not be used for signing in %s mode\n"
-msgstr "你不能夠將 %s 用於 %s 模式中\n"
++msgstr ""
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
+msgstr ""
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
-msgstr "請參考 %s 上進一步的資訊\n"
+msgstr ""
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
+msgstr ""
- #: g10/sig-check.c:303
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
++#: g10/sig-check.c:324
+#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
-msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/sig-check.c:312
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
++#: g10/sig-check.c:333
+#, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
-msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/sig-check.c:326 g10/sign.c:266
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:347 g10/sign.c:267
+#, 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] ""
-"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+msgstr[1] ""
- #: g10/sig-check.c:335
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:356
+#, 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] ""
-"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+msgstr[1] ""
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
-msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
+msgstr ""
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
-msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
+msgstr ""
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
-msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
+msgstr ""
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
+msgstr ""
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
+msgstr ""
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
-msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
+msgstr ""
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
-msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
+msgstr ""
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
-msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
+msgstr ""
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s/%s 簽章來自: \"%s\"\n"
+msgstr ""
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
-msgstr "簽署:"
+msgstr ""
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
-msgstr "%s 加密將被採用\n"
+msgstr ""
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
+msgstr ""
- #: g10/skclist.c:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
-msgstr "已跳過 \"%s\": 重複了\n"
+msgstr ""
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
-msgstr "已跳過: 私鑰已經存在\n"
+msgstr ""
- #: g10/skclist.c:251
++#: g10/skclist.c:243
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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, 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 ""
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
-#, fuzzy, c-format
-#| msgid "error sending standard options: %s\n"
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
+#, 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
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
-#, fuzzy, c-format
-#| msgid "unsupported algorithm: %s"
++#: g10/tofu.c:504
+#, c-format
msgid "unsupported TOFU database version: %s\n"
-msgstr "未支援的演算法: %s"
+msgstr ""
- #: g10/tofu.c:538
-#, fuzzy, c-format
-#| msgid "error creating temporary file: %s\n"
++#: g10/tofu.c:537
+#, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
-msgstr "建立暫存檔時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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"
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
+#, c-format
msgid "error reading TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:716 g10/tofu.c:724
-#, fuzzy, c-format
-#| msgid "error writing base64 encoding: %s\n"
++#: g10/tofu.c:715 g10/tofu.c:723
+#, c-format
msgid "error determining TOFU database's version: %s\n"
-msgstr "寫入 base64 編碼時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
-#, fuzzy, c-format
-#| msgid "error initializing reader object: %s\n"
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
+#, c-format
msgid "error initializing TOFU database: %s\n"
-msgstr "啟始讀取程式物件時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:844
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:843
+#, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
-#, fuzzy, c-format
-#| msgid "error opening '%s': %s\n"
++#: g10/tofu.c:955
+#, c-format
msgid "error opening TOFU database '%s': %s\n"
-msgstr "開啟 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
+#, c-format
msgid "error updating TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
+msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
-#, fuzzy, c-format
-#| msgid "error getting responder ID: %s\n"
++#: g10/tofu.c:1608
+#, c-format
msgid "error gathering other user IDs: %s\n"
-msgstr "取得回應程式 ID 時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1619
-#, fuzzy
-#| msgid "list key and user IDs"
++#: g10/tofu.c:1618
msgid "This key's user IDs:\n"
-msgstr "列出金鑰和使用者 ID"
+msgstr ""
- #: g10/tofu.c:1635 g10/tofu.c:1800
-#, fuzzy, c-format
-#| msgid "validity: %s"
++#: g10/tofu.c:1634 g10/tofu.c:1799
+#, c-format
msgid "policy: %s"
-msgstr "有效性: %s"
+msgstr ""
- #: g10/tofu.c:1726
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
++#: g10/tofu.c:1725
+#, c-format
msgid "error gathering signature stats: %s\n"
-msgstr "取得已存放的旗標時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
-#, fuzzy
-#| msgid "list keys"
++#: g10/tofu.c:1797
msgid "this key"
-msgstr "列出金鑰"
+msgstr ""
- #: g10/tofu.c:1824
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1823
+#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
-msgstr[0] "印出訊息摘要"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1828
-#, fuzzy, c-format
-#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:1827
+#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
-msgstr[0] "已用 %lu 個密語加密了\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1835
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1834
+#, 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:1839
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1838
+#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1902
+#, 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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
-#, fuzzy, c-format
-#| msgid "error writing key: %s\n"
++#: g10/tofu.c:2146
+#, c-format
msgid "resetting keydb: %s\n"
-msgstr "寫入金鑰時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:2614
-#, fuzzy, c-format
-#| msgid "error setting OCSP target: %s\n"
++#: g10/tofu.c:2613
+#, c-format
msgid "error setting TOFU binding's policy to %s\n"
-msgstr "設定 OCSP 目標時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:2827
-#, fuzzy, c-format
-#| msgid "error creating a pipe: %s\n"
++#: g10/tofu.c:2826
+#, c-format
msgid "error changing TOFU policy: %s\n"
-msgstr "建立管道時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
-#, fuzzy, c-format
-#| msgid "Deleted %d signatures.\n"
++#: g10/tofu.c:3148
+#, c-format
msgid "%s: Verified 0 signatures."
-msgstr "已經刪除了 %d 份簽章.\n"
+msgstr ""
- #: g10/tofu.c:3158
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:3156
+#, 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:3168
-#, fuzzy
-#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:3166
msgid "Encrypted 0 messages."
-msgstr "已用 %lu 個密語加密了\n"
+msgstr ""
- #: g10/tofu.c:3176
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:3174
+#, 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:3187
-#, fuzzy, c-format
-#| msgid "validity: %s"
++#: g10/tofu.c:3185
+#, c-format
msgid "(policy: %s)"
-msgstr "有效性: %s"
+msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -6893,133 -5664,107 +6878,133 @@@ msgid_plural "
" %s\n"
"to mark it as being bad.\n"
msgstr[0] ""
+msgstr[1] ""
- #: 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"
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
+#, c-format
msgid "error opening TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
-#, fuzzy, c-format
-#| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3915
+#, 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"
@@@ -7128,53 -5864,42 +7113,53 @@@ msgid "
"Syntax: kbxutil [options] [files]\n"
"List, export, import Keybox data\n"
msgstr ""
-"語法: kbxutil [選項] [檔案]\n"
-"列出, 匯出, 匯入金鑰鑰匙盒資料\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
+msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
+msgstr ""
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
-msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
+msgstr ""
+#: scd/app-nks.c:839
msgid "the NullPIN has not yet been changed\n"
-msgstr "NullPIN 還沒有變更過\n"
+msgstr ""
+#: scd/app-nks.c:1100
msgid "|N|Please enter a new PIN for the standard keys."
-msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
+msgstr ""
+#: scd/app-nks.c:1101
msgid "||Please enter the PIN for the standard keys."
-msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
+msgstr ""
+#: scd/app-nks.c:1107
msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
-msgstr "|NP|請輸入標準金鑰將採用的 PIN 重設碼 (PUK)."
+msgstr ""
+#: scd/app-nks.c:1109
msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
-msgstr "|P|請輸入標準金鑰的 PIN 重設碼 (PUK)."
+msgstr ""
+#: scd/app-nks.c:1117
msgid "|N|Please enter a new PIN for the key to create qualified signatures."
-msgstr "|N|請輸入金鑰的新個人識別碼 (PIN) 以建立完善的簽章."
+msgstr ""
+#: scd/app-nks.c:1119
msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
+msgstr ""
+#: scd/app-nks.c:1127
msgid ""
"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
"qualified signatures."
@@@ -7184,99 -5908,84 +7169,99 @@@ msgstr "
msgid ""
"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
"qualified signatures."
-msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
+msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
-msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
+msgstr ""
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
-msgstr "存放指紋失敗: %s\n"
+msgstr ""
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
-msgstr "存放創生日期失敗: %s\n"
+msgstr ""
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
-msgstr "從卡片取回 CHV 狀態時出錯\n"
+msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
-msgstr "回應中未包含 RSA 系數\n"
+msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
-msgstr "回應中未包含 RSA 公用指數\n"
+msgstr ""
- #: scd/app-openpgp.c:1452
-#, fuzzy
-#| msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1469
msgid "response does not contain the EC public key\n"
-msgstr "回應中未包含 EC 公用指數\n"
+msgstr ""
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
-msgstr "回應中未包含公鑰資料\n"
+msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
-msgstr "讀取公鑰時失敗: %s\n"
+msgstr ""
#. TRANSLATORS: Put a \x1f right before a colon. This can be
#. * used by pinentry to nicely align the names and values. Keep
#. * the %s at the start and end of the string.
- #: scd/app-openpgp.c:1991
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
-msgstr "以 %s 做為預設 PIN\n"
+msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
-msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
+msgstr ""
- #: scd/app-openpgp.c:2096
-#, fuzzy
-#| msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2113
msgid "||Please unlock the card"
-msgstr "||請輸入個人識別碼 (PIN)"
+msgstr ""
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
+msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
-msgstr "驗證 CHV%d 失敗: %s\n"
+msgstr ""
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
-msgstr "卡片永久鎖定了!!\n"
+msgstr ""
- #: scd/app-openpgp.c:2233
-#, fuzzy, c-format
-#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
++#: scd/app-openpgp.c:2250
+#, 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"
@@@ -7285,479 -5993,373 +7270,479 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
-msgstr "|A|請輸入管理者 PIN"
+msgstr ""
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
-msgstr "管理者指令存取權限尚未組態\n"
+msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
-msgstr "||請輸入個人識別碼 (PIN)"
+msgstr ""
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
-msgstr "||請輸入卡片的重設碼"
+msgstr ""
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
-msgstr "重設碼太短; 長度最少要有 %d\n"
+msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
-msgstr "|RN|新增重設碼"
+msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
-msgstr "|AN|新增管理者個人識別碼 (PIN)"
+msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
-msgstr "|N|新增個人識別碼 (PIN)"
+msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
-msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
+msgstr ""
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
-msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
+msgstr ""
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
-msgstr "讀取應用程式資料時出錯\n"
+msgstr ""
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
-msgstr "讀取指紋 DO 時出錯\n"
+msgstr ""
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
-msgstr "金鑰已存在\n"
+msgstr ""
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
-msgstr "既有的金鑰將被取代\n"
+msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
-msgstr "正在產生新的金鑰\n"
+msgstr ""
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
-msgstr "正在寫入新的金鑰\n"
+msgstr ""
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
-msgstr "缺漏創生時間戳印\n"
+msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
+msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
-msgstr "存放金鑰失敗: %s\n"
+msgstr ""
- #: scd/app-openpgp.c:3691
-#, fuzzy
-#| msgid "unsupported inquiry '%s'\n"
++#: scd/app-openpgp.c:3708
msgid "unsupported curve\n"
-msgstr "未支援的查詢 '%s'\n"
+msgstr ""
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
-msgstr "正在產生金鑰中, 請稍候 ...\n"
+msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
-msgstr "產生金鑰時失敗\n"
+msgstr ""
- #: scd/app-openpgp.c:3972
-#, fuzzy, c-format
-#| msgid "key generation completed (%d seconds)\n"
++#: scd/app-openpgp.c:3989
+#, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
-msgstr[0] "金鑰產生完畢 (%d 秒)\n"
+msgstr[0] ""
+msgstr[1] ""
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
+msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
-msgstr "卡片上的指紋與所要求的那個並不吻合\n"
+msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
-msgstr "卡片不支援 %s 摘要演算法\n"
+msgstr ""
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
-msgstr "目前建立的簽章: %lu\n"
+msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
-msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
+msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
+msgstr ""
+#: scd/app-dinsig.c:299
msgid "||Please enter your PIN at the reader's pinpad"
-msgstr "||請在讀卡機鍵盤上輸入你的個人識別碼 (PIN)"
+msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
-msgstr "|N|開始新增個人識別碼 (PIN)"
+msgstr ""
+#: scd/scdaemon.c:114
msgid "run in multi server mode (foreground)"
-msgstr "以多重伺服器模式執行 (前景)"
+msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|等級|設定除錯等級為指定等級"
+msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
-msgstr "|檔案|將日誌寫入至指定檔案"
+msgstr ""
+#: scd/scdaemon.c:133
msgid "|N|connect to reader at port N"
-msgstr "|N|從 N 埠連線至讀卡機"
+msgstr ""
+#: scd/scdaemon.c:135
msgid "|NAME|use NAME as ct-API driver"
-msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:137
msgid "|NAME|use NAME as PC/SC driver"
-msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:140
msgid "do not use the internal CCID driver"
-msgstr "不要使用內部的 CCID 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:146
msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
+msgstr ""
+#: scd/scdaemon.c:149
msgid "do not use a reader's pinpad"
-msgstr "不要使用讀卡機鍵盤"
+msgstr ""
+#: scd/scdaemon.c:154
msgid "deny the use of admin card commands"
-msgstr "禁用管理者卡片指令"
+msgstr ""
+#: scd/scdaemon.c:157
msgid "use variable length input for pinpad"
-msgstr "輸入 PIN 時在輸入區顯示成變動長度"
+msgstr ""
+#: scd/scdaemon.c:291
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
-msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
+msgstr ""
+#: scd/scdaemon.c:293
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
-"語法: scdaemon [選項] [指令 [引數]]\n"
-"@GNUPG@ 智慧卡服務\n"
+#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
-msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
+msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
-msgstr "用於 fd %d 的經手程式已啟動\n"
+msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
-msgstr "用於 fd %d 的經手程式已終止\n"
+msgstr ""
-#, fuzzy
-#| msgid "no gpg-agent running in this session\n"
+#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
-msgstr "在此階段中沒有執行中的 gpg-agent\n"
+msgstr ""
+#: sm/certchain.c:194
#, c-format
msgid "validation model requested by certificate: %s"
-msgstr "憑證所要求的驗證模型: %s"
+msgstr ""
+#: sm/certchain.c:195 sm/certchain.c:1937
msgid "chain"
-msgstr "chain"
+msgstr ""
+#: sm/certchain.c:196 sm/certchain.c:1937
msgid "shell"
-msgstr "shell"
+msgstr ""
+#: sm/certchain.c:256 dirmngr/validate.c:144
#, c-format
msgid "critical certificate extension %s is not supported"
-msgstr "未支援關鍵憑證擴充欄位 %s"
+msgstr ""
+#: sm/certchain.c:295 dirmngr/validate.c:242
msgid "issuer certificate is not marked as a CA"
-msgstr "發行者憑證並未標記為 CA"
+msgstr ""
+#: sm/certchain.c:333
msgid "critical marked policy without configured policies"
-msgstr "關鍵已標記原則沒有已組態的原則"
+msgstr ""
+#: sm/certchain.c:343
#, c-format
msgid "failed to open '%s': %s\n"
-msgstr "開啟 '%s' 失敗: %s\n"
+msgstr ""
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
msgid "Note: non-critical certificate policy not allowed"
-msgstr "請注意: 不允許非關鍵的憑證原則"
+msgstr ""
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
msgid "certificate policy not allowed"
-msgstr "未允許憑證原則"
+msgstr ""
+#: sm/certchain.c:538
msgid "looking up issuer at external location\n"
-msgstr "從外部位置尋找發行者\n"
+msgstr ""
+#: sm/certchain.c:558
#, c-format
msgid "number of issuers matching: %d\n"
-msgstr "吻合的發行者數量: %d\n"
+msgstr ""
+#: sm/certchain.c:606
msgid "looking up issuer from the Dirmngr cache\n"
-msgstr "從 Dirmngr 快取尋找發行者\n"
+msgstr ""
+#: sm/certchain.c:631
#, c-format
msgid "number of matching certificates: %d\n"
-msgstr "吻合的憑證數量: %d\n"
+msgstr ""
+#: sm/certchain.c:634
#, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
+msgstr ""
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
-msgstr "配置 keyDB 代號失敗\n"
+msgstr ""
+#: sm/certchain.c:999
msgid "certificate has been revoked"
-msgstr "憑證已撤銷"
+msgstr ""
+#: sm/certchain.c:1014
msgid "the status of the certificate is unknown"
-msgstr "憑證的狀態未知"
+msgstr ""
+#: sm/certchain.c:1021
msgid "please make sure that the \"dirmngr\" is properly installed\n"
-msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
+msgstr ""
+#: sm/certchain.c:1027
#, c-format
msgid "checking the CRL failed: %s"
-msgstr "檢查 CRL 時失敗: %s"
+msgstr ""
+#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
#, c-format
msgid "certificate with invalid validity: %s"
-msgstr "有效性無效的憑證: %s"
+msgstr ""
+#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
msgid "certificate not yet valid"
-msgstr "憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1072 sm/certchain.c:1157
msgid "root certificate not yet valid"
-msgstr "根憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1073 sm/certchain.c:1158
msgid "intermediate certificate not yet valid"
-msgstr "媒介憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1086 dirmngr/validate.c:526
msgid "certificate has expired"
-msgstr "憑證已過期"
+msgstr ""
+#: sm/certchain.c:1087
msgid "root certificate has expired"
-msgstr "根憑證已過期"
+msgstr ""
+#: sm/certchain.c:1088
msgid "intermediate certificate has expired"
-msgstr "媒介憑證已過期"
+msgstr ""
+#: sm/certchain.c:1130
#, c-format
msgid "required certificate attributes missing: %s%s%s"
-msgstr "遺失所需的憑證屬性: %s%s%s"
+msgstr ""
+#: sm/certchain.c:1139
msgid "certificate with invalid validity"
-msgstr "有效性無效的憑證"
+msgstr ""
+#: sm/certchain.c:1176
msgid "signature not created during lifetime of certificate"
-msgstr "簽章並非在憑證生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1178
msgid "certificate not created during lifetime of issuer"
-msgstr "憑證並非在發行者生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1179
msgid "intermediate certificate not created during lifetime of issuer"
-msgstr "媒介憑證並非在發行者生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1183
msgid " ( signature created at "
-msgstr " ( 簽章建立於 "
+msgstr ""
+#: sm/certchain.c:1184
msgid " (certificate created at "
-msgstr " ( 憑證建立於 "
+msgstr ""
+#: sm/certchain.c:1187
msgid " (certificate valid from "
-msgstr " (憑證有效自 "
+msgstr ""
+#: sm/certchain.c:1188
msgid " ( issuer valid from "
-msgstr " ( 發行者有效自 "
+msgstr ""
+#: sm/certchain.c:1218 dirmngr/validate.c:577
#, c-format
msgid "fingerprint=%s\n"
-msgstr "指紋=%s\n"
+msgstr ""
+#: sm/certchain.c:1227
msgid "root certificate has now been marked as trusted\n"
-msgstr "根憑證現在已標記為已信任\n"
+msgstr ""
+#: sm/certchain.c:1240
msgid "interactive marking as trusted not enabled in gpg-agent\n"
-msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
+msgstr ""
+#: sm/certchain.c:1246
msgid "interactive marking as trusted disabled for this session\n"
-msgstr "互動式標記為已信任在此作業階段中已停用\n"
+msgstr ""
+#: sm/certchain.c:1304
msgid "WARNING: creation time of signature not known - assuming current time"
-msgstr "警告: 簽章創造時間未知 - 假設為此刻"
+msgstr ""
+#: sm/certchain.c:1368
msgid "no issuer found in certificate"
-msgstr "憑證中找不到發行者"
+msgstr ""
+#: sm/certchain.c:1446
msgid "self-signed certificate has a BAD signature"
-msgstr "自簽憑證有 不良 簽章"
+msgstr ""
+#: sm/certchain.c:1515 dirmngr/validate.c:575
msgid "root certificate is not marked trusted"
-msgstr "根憑證未標記為已信任"
+msgstr ""
+#: sm/certchain.c:1531
#, c-format
msgid "checking the trust list failed: %s\n"
-msgstr "檢查信任清單時失敗: %s\n"
+msgstr ""
+#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
msgid "certificate chain too long\n"
-msgstr "憑證鏈太長\n"
+msgstr ""
+#: sm/certchain.c:1574 dirmngr/validate.c:642
msgid "issuer certificate not found"
-msgstr "找不到發行者憑證"
+msgstr ""
+#: sm/certchain.c:1607 dirmngr/validate.c:668
msgid "certificate has a BAD signature"
-msgstr "憑證有 不良 簽章"
+msgstr ""
+#: sm/certchain.c:1639 dirmngr/validate.c:692
msgid "found another possible matching CA certificate - trying again"
-msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
+msgstr ""
+#: sm/certchain.c:1698 dirmngr/validate.c:717
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
-msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
+msgstr ""
+#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
msgid "certificate is good\n"
-msgstr "憑證完好\n"
+msgstr ""
+#: sm/certchain.c:1741
msgid "intermediate certificate is good\n"
-msgstr "媒介憑證良好\n"
+msgstr ""
+#: sm/certchain.c:1742
msgid "root certificate is good\n"
-msgstr "根憑證完好\n"
+msgstr ""
+#: sm/certchain.c:1924
msgid "switching to chain model"
-msgstr "切換至鏈模型"
+msgstr ""
+#: sm/certchain.c:1933
#, c-format
msgid "validation model used: %s"
-msgstr "已使用的驗證模型: %s"
+msgstr ""
+#: sm/certcheck.c:107
#, c-format
msgid "a %u bit hash is not valid for a %u bit %s key\n"
-msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
+msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
-msgstr "(這是 MD2 演算法)\n"
+msgstr ""
+#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:707
msgid "none"
-msgstr "無"
+msgstr ""
+#: sm/certdump.c:552 sm/certdump.c:617
msgid "[Error - invalid encoding]"
-msgstr "[錯誤 - 無效的編碼]"
+msgstr ""
+#: sm/certdump.c:560
msgid "[Error - out of core]"
-msgstr "[錯誤 - 超出核心]"
+msgstr ""
+#: sm/certdump.c:596
msgid "[Error - No name]"
-msgstr "[錯誤 - 沒有名稱]"
+msgstr ""
+#: sm/certdump.c:623
msgid "[Error - invalid DN]"
-msgstr "[錯誤 - 無效的 DN]"
+msgstr ""
+#: sm/certdump.c:833
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -7766,131 -6368,108 +7751,131 @@@
"S/N %s, ID 0x%08lX,\n"
"created %s, expires %s.\n"
msgstr ""
-"請輸入密語來解開 X.509 憑證所需的私鑰:\n"
-"\"%s\"\n"
-"S/N %s, ID 0x%08lX,\n"
-"建立於 %s, 於 %s 到期.\n"
+#: sm/certlist.c:122 dirmngr/validate.c:1111
msgid "no key usage specified - assuming all usages\n"
-msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
+msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
-msgstr "取得金鑰用途資訊時出錯: %s\n"
+msgstr ""
+#: sm/certlist.c:142 dirmngr/validate.c:1152
msgid "certificate should not have been used for certification\n"
-msgstr "憑證應該還未被用於憑證\n"
+msgstr ""
+#: sm/certlist.c:154 dirmngr/validate.c:1162
msgid "certificate should not have been used for OCSP response signing\n"
-msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
+msgstr ""
+#: sm/certlist.c:165 dirmngr/validate.c:1145
msgid "certificate should not have been used for encryption\n"
-msgstr "憑證應該還未被用於加密\n"
+msgstr ""
+#: sm/certlist.c:166 dirmngr/validate.c:1135
msgid "certificate should not have been used for signing\n"
-msgstr "憑證應該還未被用於簽署\n"
+msgstr ""
+#: sm/certlist.c:167 dirmngr/validate.c:1146
msgid "certificate is not usable for encryption\n"
-msgstr "憑證無法用於加密\n"
+msgstr ""
+#: sm/certlist.c:168 dirmngr/validate.c:1136
msgid "certificate is not usable for signing\n"
-msgstr "憑證無法用於簽署\n"
+msgstr ""
+#: sm/certreqgen.c:464
#, c-format
msgid "line %d: invalid algorithm\n"
-msgstr "第 %d 列: 無效的演算法\n"
+msgstr ""
+#: sm/certreqgen.c:478
#, c-format
msgid "line %d: invalid key length %u (valid are %d to %d)\n"
-msgstr "第 %d 列: 金鑰長度 %u 無效 (有效範圍是從 %d 至 %d)\n"
+msgstr ""
+#: sm/certreqgen.c:496
#, c-format
msgid "line %d: no subject name given\n"
-msgstr "第 %d 列: 沒有給定的物件名稱\n"
+msgstr ""
+#: sm/certreqgen.c:505
#, c-format
msgid "line %d: invalid subject name label '%.*s'\n"
-msgstr "第 %d 列: 無效的主旨名稱標籤 '%.*s'\n"
+msgstr ""
+#: sm/certreqgen.c:508
#, c-format
msgid "line %d: invalid subject name '%s' at pos %d\n"
-msgstr "第 %d 列: 無效的主旨名稱 '%s' 於第 %d 位置\n"
+msgstr ""
+#: sm/certreqgen.c:525
#, c-format
msgid "line %d: not a valid email address\n"
-msgstr "第 %d 列: 不是有效的電子郵件地址\n"
+msgstr ""
+#: sm/certreqgen.c:544
#, c-format
msgid "line %d: invalid serial number\n"
-msgstr "第 %d 列: 無效的序號\n"
+msgstr ""
+#: sm/certreqgen.c:560
#, c-format
msgid "line %d: invalid issuer name label '%.*s'\n"
-msgstr "第 %d 列: 無效的發行者名稱標籤 '%.*s'\n"
+msgstr ""
+#: sm/certreqgen.c:563
#, c-format
msgid "line %d: invalid issuer name '%s' at pos %d\n"
-msgstr "第 %d 列: 無效的發行者名稱 '%s' 於第 %d 位置\n"
+msgstr ""
+#: sm/certreqgen.c:575 sm/certreqgen.c:586
#, c-format
msgid "line %d: invalid date given\n"
-msgstr "第 %d 列: 無效的給定日期\n"
+msgstr ""
+#: sm/certreqgen.c:599
#, c-format
msgid "line %d: error getting signing key by keygrip '%s': %s\n"
-msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得簽署金鑰時出錯: %s\n"
+msgstr ""
+#: sm/certreqgen.c:618
#, c-format
msgid "line %d: invalid hash algorithm given\n"
-msgstr "第 %d 列: 無效的給定雜湊演算法\n"
+msgstr ""
+#: sm/certreqgen.c:633
#, c-format
msgid "line %d: invalid authority-key-id\n"
-msgstr "第 %d 列: 無效的 authority-key-id\n"
+msgstr ""
+#: sm/certreqgen.c:648
#, c-format
msgid "line %d: invalid subject-key-id\n"
-msgstr "第 %d 列: 無效的 subject-key-id\n"
+msgstr ""
+#: sm/certreqgen.c:686
#, c-format
msgid "line %d: invalid extension syntax\n"
-msgstr "第 %d 列: 無效的擴充語法\n"
+msgstr ""
+#: sm/certreqgen.c:699
#, c-format
msgid "line %d: error reading key '%s' from card: %s\n"
-msgstr "第 %d 列: 從卡片讀取金鑰 '%s' 時出錯: %s\n"
+msgstr ""
+#: sm/certreqgen.c:712
#, c-format
msgid "line %d: error getting key by keygrip '%s': %s\n"
-msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得金鑰時出錯: %s\n"
+msgstr ""
+#: sm/certreqgen.c:729
#, c-format
msgid "line %d: key generation failed: %s <%s>\n"
-msgstr "第 %d 列: 金鑰產生失敗: %s <%s>\n"
+msgstr ""
+#: sm/certreqgen.c:1328
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -7963,346 -6529,270 +7948,346 @@@ msgstr "
#. adjust it do the length of your translation. The
#. second string is merely passed to atoi so you can
#. drop everything after the number.
+#: sm/certreqgen-ui.c:320
#, c-format
msgid "Invalid subject name '%s'\n"
-msgstr "無效的主旨名稱 '%s'\n"
+msgstr ""
+#: sm/certreqgen-ui.c:322
msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
-msgstr "16"
+msgstr ""
+#: sm/certreqgen-ui.c:334
msgid "Enter email addresses"
-msgstr "請輸入電子郵件地址"
+msgstr ""
+#: sm/certreqgen-ui.c:335
msgid " (end with an empty line):\n"
-msgstr " (以空白列結束):\n"
+msgstr ""
+#: sm/certreqgen-ui.c:339
msgid "Enter DNS names"
-msgstr "請輸入 DNS 名稱"
+msgstr ""
+#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
msgid " (optional; end with an empty line):\n"
-msgstr " (非必要; 以空白列結束):\n"
+msgstr ""
+#: sm/certreqgen-ui.c:344
msgid "Enter URIs"
-msgstr "請輸入 URI"
+msgstr ""
+#: sm/certreqgen-ui.c:351
msgid "Create self-signed certificate? (y/N) "
-msgstr "要建立自簽憑證嗎? (y/N) "
+msgstr ""
+#: sm/certreqgen-ui.c:378
msgid "These parameters are used:\n"
-msgstr "採用下列這些參數:\n"
+msgstr ""
+#: sm/certreqgen-ui.c:396
msgid "Now creating self-signed certificate. "
-msgstr "現在正在建立自簽憑證. "
+msgstr ""
+#: sm/certreqgen-ui.c:398
msgid "Now creating certificate request. "
-msgstr "現在正在建立憑證請求. "
+msgstr ""
+#: sm/certreqgen-ui.c:399
msgid "This may take a while ...\n"
-msgstr "這可能會花點時間 ...\n"
+msgstr ""
+#: sm/certreqgen-ui.c:410
msgid "Ready.\n"
-msgstr "準備妥當.\n"
+msgstr ""
+#: sm/certreqgen-ui.c:413
msgid "Ready. You should now send this request to your CA.\n"
-msgstr "準備好了. 你現在就該把此請求送到你的 CA.\n"
+msgstr ""
+#: sm/certreqgen-ui.c:419
msgid "resource problem: out of core\n"
-msgstr "資源問題: 超出核心\n"
+msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
-msgstr "(這是 RC2 演算法)\n"
+msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
-msgstr "(這看起來不像是個加密過的訊息)\n"
+msgstr ""
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate '%s' not found: %s\n"
-msgstr "找不到憑證 '%s': %s\n"
+msgstr ""
+#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
#, c-format
msgid "error locking keybox: %s\n"
-msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
+msgstr ""
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate '%s' deleted\n"
-msgstr "重複的憑證 '%s' 已刪除\n"
+msgstr ""
+#: sm/delete.c:145
#, c-format
msgid "certificate '%s' deleted\n"
-msgstr "憑證 '%s' 已刪除\n"
+msgstr ""
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
-msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
+msgstr ""
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
-msgstr "沒有給定有效的收件者\n"
+msgstr ""
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
-msgstr "列出外部金鑰"
+msgstr ""
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
-msgstr "列出憑證鏈"
+msgstr ""
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
-msgstr "匯入憑證"
+msgstr ""
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
-msgstr "匯出憑證"
+msgstr ""
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
-msgstr "註冊智慧卡"
+msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
-msgstr "將指令遞送給 dirmngr"
+msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
-msgstr "叫用 gpg-protect-tool"
+msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
-msgstr "建立以 base-64 編碼過的輸出"
+msgstr ""
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
-msgstr "假設輸入的是 PEM 格式"
+msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
-msgstr "假設輸入的是 base-64 格式"
+msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
-msgstr "假設輸入的是二進制格式"
+msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
-msgstr "永遠不要查閱 CRL"
+msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
-msgstr "用 OCSP 檢查有效性"
+msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
-msgstr "|N|要包含的憑證數量"
+msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
-msgstr "|檔案|從指定檔案中取得原則資訊"
+msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
-msgstr "不要檢查憑證原則"
+msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
-msgstr "取回遺失的發行者憑證"
+msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
-msgstr "完全不要使用終端機"
+msgstr ""
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
-msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
+msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
-msgstr "|檔案|將稽核日誌寫入至指定檔案"
+msgstr ""
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
-msgstr "批次模式: 永遠不詢問"
+msgstr ""
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
-msgstr "假設大部分的問題都回答是"
+msgstr ""
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
-msgstr "假設大部分的問題都回答否"
+msgstr ""
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
+msgstr ""
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
+msgstr ""
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
+msgstr ""
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
-msgstr "|名稱|使用指定名稱的編密演算法"
+msgstr ""
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
-msgstr "|名稱|使用指定名稱的訊息摘要演算法"
+msgstr ""
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
-msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
+msgstr ""
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
"Default operation depends on the input data\n"
msgstr ""
-"語法: @GPGSM@ [選項] [檔案]\n"
-"用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
-"預設的操作會依輸入資料而定\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
-msgstr "請注意: 將無法加密為 '%s': %s\n"
+msgstr ""
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
-msgstr "未知的驗證模型 '%s'\n"
+msgstr ""
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: 沒有給定主機名稱\n"
+msgstr ""
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: 給定的密碼沒有使用者\n"
+msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: 正在跳過這一列\n"
+msgstr ""
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
-msgstr "無法剖析金鑰伺服器\n"
+msgstr ""
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
-msgstr "正在匯入通用憑證 '%s'\n"
+msgstr ""
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
-msgstr "無法用 '%s' 來簽署: %s\n"
+msgstr ""
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
-msgstr "無效的指令 (沒有這樣的指令)\n"
+msgstr ""
+#: sm/import.c:127
#, c-format
msgid "total number processed: %lu\n"
-msgstr "處理總量: %lu\n"
+msgstr ""
+#: sm/import.c:246
msgid "error storing certificate\n"
-msgstr "存放憑證時出錯\n"
+msgstr ""
+#: sm/import.c:254
msgid "basic certificate checks failed - not imported\n"
-msgstr "基本的憑證檢查失敗了 - 未匯入\n"
+msgstr ""
+#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
#, c-format
msgid "error getting stored flags: %s\n"
-msgstr "取得已存放的旗標時出錯: %s\n"
+msgstr ""
+#: sm/import.c:531 sm/import.c:563
#, c-format
msgid "error importing certificate: %s\n"
-msgstr "匯入憑證時出錯: %s\n"
+msgstr ""
+#: sm/import.c:751 tools/gpg-connect-agent.c:1433
#, c-format
msgid "error reading input: %s\n"
-msgstr "讀取輸入時出錯: %s\n"
+msgstr ""
+#: sm/keydb.c:1126 sm/keydb.c:1212
msgid "failed to get the fingerprint\n"
-msgstr "取得指紋失敗\n"
+msgstr ""
+#: sm/keydb.c:1168
#, c-format
msgid "problem looking for existing certificate: %s\n"
-msgstr "查找既有憑證的問題: %s\n"
+msgstr ""
+#: sm/keydb.c:1180
#, c-format
msgid "error finding writable keyDB: %s\n"
-msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
+msgstr ""
+#: sm/keydb.c:1188
#, c-format
msgid "error storing certificate: %s\n"
-msgstr "存放憑證時出錯: %s\n"
+msgstr ""
+#: sm/keydb.c:1240
#, c-format
msgid "problem re-searching certificate: %s\n"
-msgstr "重新搜尋憑證的問題: %s\n"
+msgstr ""
+#: sm/keydb.c:1261 sm/keydb.c:1350
#, c-format
msgid "error storing flags: %s\n"
-msgstr "存放旗標時出錯: %s\n"
+msgstr ""
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
-msgstr "錯誤 - "
+msgstr ""
+#: sm/misc.c:58
msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr "尚未設定 GPG_TTY - 使用可能是偽造的預設值\n"
+msgstr ""
+#: sm/qualified.c:105
#, c-format
msgid "invalid formatted fingerprint in '%s', line %d\n"
-msgstr "無效的格式化指紋於 '%s', 第 %d 列\n"
+msgstr ""
+#: sm/qualified.c:123
#, c-format
msgid "invalid country code in '%s', line %d\n"
-msgstr "無效的國家代碼於 '%s', 第 %d 列\n"
+msgstr ""
+#: sm/qualified.c:206
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@@ -8312,8 -6802,12 +8297,8 @@@
"\n"
"%s%sAre you really sure that you want to do this?"
msgstr ""
-"你正要用你的這個憑證來建立簽章:\n"
-"\"%s\"\n"
-"這會建立出在法律上與簽名等效的合格簽章.\n"
-"\n"
-"%s%s請問你是否真的確定要這樣做了?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8326,372 -6819,298 +8311,372 @@@ msgid "
"\"%s\"\n"
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-"你正要用你的這個憑證來建立簽章:\n"
-"\"%s\"\n"
-"請注意, 這個憑證並 不會 建立出合格的簽章!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
-msgstr "雜湊演算法 %d (%s) 為簽署者 %d 所用, 但並不支援; 改用 %s\n"
+msgstr ""
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
-msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
+msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
-msgstr "檢查合格憑證時失敗: %s\n"
+msgstr ""
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
-msgstr "簽章建立於 "
+msgstr ""
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
-msgstr "[ 未給定日期 ]"
+msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
-msgstr " 以憑證 ID 0x%08lX\n"
+msgstr ""
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
-msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
+msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
-msgstr "完好的簽章來自於"
+msgstr ""
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
-msgstr " 亦即"
+msgstr ""
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
-msgstr "這是一份合格簽章\n"
+msgstr ""
+#: dirmngr/certcache.c:120
#, c-format
msgid "can't initialize certificate cache lock: %s\n"
-msgstr "無法啟始憑證快取鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:131
#, c-format
msgid "can't acquire read lock on the certificate cache: %s\n"
-msgstr "無法取得憑證快取的讀取鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:142
#, c-format
msgid "can't acquire write lock on the certificate cache: %s\n"
-msgstr "無法取得憑證快取的寫入鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:153
#, c-format
msgid "can't release lock on the certificate cache: %s\n"
-msgstr "無法釋放憑證快取鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:293
#, c-format
msgid "dropping %u certificates from the cache\n"
-msgstr "正在從快取中拋棄 %u 份憑證\n"
+msgstr ""
+#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
#, c-format
msgid "can't parse certificate '%s': %s\n"
-msgstr "無法剖析憑證 '%s': %s\n"
+msgstr ""
+#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:617
#, c-format
msgid "certificate '%s' already cached\n"
-msgstr "憑證 '%s' 已快取\n"
+msgstr ""
+#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:626
#, c-format
msgid "trusted certificate '%s' loaded\n"
-msgstr "信任的憑證 '%s' 已載入\n"
+msgstr ""
+#: dirmngr/certcache.c:423
#, c-format
msgid "certificate '%s' loaded\n"
-msgstr "憑證 '%s' 已載入\n"
+msgstr ""
+#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:628
#, c-format
msgid " SHA1 fingerprint = %s\n"
-msgstr " SHA1 指紋 = %s\n"
+msgstr ""
+#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:631
msgid " issuer ="
-msgstr " 發行者 ="
+msgstr ""
+#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:632
msgid " subject ="
-msgstr " 主旨 ="
+msgstr ""
+#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:620
#, c-format
msgid "error loading certificate '%s': %s\n"
-msgstr "載入憑證 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:804
#, c-format
msgid "permanently loaded certificates: %u\n"
-msgstr "固定載入的憑證: %u\n"
+msgstr ""
+#: dirmngr/certcache.c:806
#, c-format
msgid " runtime cached certificates: %u\n"
-msgstr " 執行時期快取的憑證: %u\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid " runtime cached certificates: %u\n"
+#: dirmngr/certcache.c:808
+#, c-format
msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
-msgstr " 執行時期快取的憑證: %u\n"
+msgstr ""
+#: dirmngr/certcache.c:827 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
-msgstr "憑證早已快取\n"
+msgstr ""
+#: dirmngr/certcache.c:829
msgid "certificate cached\n"
-msgstr "憑證已快取\n"
+msgstr ""
+#: dirmngr/certcache.c:831 dirmngr/certcache.c:851
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
-msgstr "快取憑證時出錯: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:914
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
-msgstr "無效的 SHA1 指紋字串 '%s'\n"
+msgstr ""
+#: dirmngr/certcache.c:1360 dirmngr/certcache.c:1369
#, c-format
msgid "error fetching certificate by S/N: %s\n"
-msgstr "以序號取得憑證時出錯: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:1521 dirmngr/certcache.c:1530
#, c-format
msgid "error fetching certificate by subject: %s\n"
-msgstr "以主旨取得憑證時出錯: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:1636 dirmngr/validate.c:483
msgid "no issuer found in certificate\n"
-msgstr "憑證中找不到發行者\n"
+msgstr ""
+#: dirmngr/certcache.c:1646
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
-msgstr "取得 authorityKeyIdentifier 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:213
#, c-format
msgid "creating directory '%s'\n"
-msgstr "正在建立目錄 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:217
#, c-format
msgid "error creating directory '%s': %s\n"
-msgstr "建立目錄 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:245
#, c-format
msgid "ignoring database dir '%s'\n"
-msgstr "正在忽略資料庫目錄 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:254
#, c-format
msgid "error reading directory '%s': %s\n"
-msgstr "讀取目錄 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:275
#, c-format
msgid "removing cache file '%s'\n"
-msgstr "正在移除快取檔案 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:284
#, c-format
msgid "not removing file '%s'\n"
-msgstr "不移除檔案 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
#, c-format
msgid "error closing cache file: %s\n"
-msgstr "關閉快取檔案時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
#, c-format
msgid "failed to open cache dir file '%s': %s\n"
-msgstr "開啟快取目錄檔案 '%s' 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:421
#, c-format
msgid "error creating new cache dir file '%s': %s\n"
-msgstr "建立新快取目錄檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:428
#, c-format
msgid "error writing new cache dir file '%s': %s\n"
-msgstr "寫入新快取目錄檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:435
#, c-format
msgid "error closing new cache dir file '%s': %s\n"
-msgstr "關閉新快取目錄檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:440
#, c-format
msgid "new cache dir file '%s' created\n"
-msgstr "新的快取目錄檔案 '%s' 已建立\n"
+msgstr ""
+#: dirmngr/crlcache.c:445
#, c-format
msgid "failed to re-open cache dir file '%s': %s\n"
-msgstr "重新開啟快取目錄檔案 '%s' 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:473
#, c-format
msgid "first record of '%s' is not the version\n"
-msgstr "第一個 '%s' 記錄並非版本\n"
+msgstr ""
+#: dirmngr/crlcache.c:488
msgid "old version of cache directory - cleaning up\n"
-msgstr "舊版的快取目錄 - 正在清理\n"
+msgstr ""
+#: dirmngr/crlcache.c:504
msgid "old version of cache directory - giving up\n"
-msgstr "舊版的快取目錄 - 正在放棄\n"
+msgstr ""
+#: dirmngr/crlcache.c:615
#, c-format
msgid "extra field detected in crl record of '%s' line %u\n"
-msgstr "'%s' 的 crl 記錄內偵測到額外的欄位位於第 %u 列\n"
+msgstr ""
+#: dirmngr/crlcache.c:623
#, c-format
msgid "invalid line detected in '%s' line %u\n"
-msgstr "偵測到 '%s' 第 %u 列有無效的列\n"
+msgstr ""
+#: dirmngr/crlcache.c:632
#, c-format
msgid "duplicate entry detected in '%s' line %u\n"
-msgstr "偵測到 '%s' 第 %u 列有重複的項目\n"
+msgstr ""
+#: dirmngr/crlcache.c:647
#, c-format
msgid "unsupported record type in '%s' line %u skipped\n"
-msgstr "'%s' 第 %u 列有未支援的紀錄類型故已跳過\n"
+msgstr ""
+#: dirmngr/crlcache.c:673
#, c-format
msgid "invalid issuer hash in '%s' line %u\n"
-msgstr "'%s' 第 %u 列有無效的發行者雜湊\n"
+msgstr ""
+#: dirmngr/crlcache.c:679
#, c-format
msgid "no issuer DN in '%s' line %u\n"
-msgstr "'%s' 第 %u 列沒有發行者 DN\n"
+msgstr ""
+#: dirmngr/crlcache.c:686
#, c-format
msgid "invalid timestamp in '%s' line %u\n"
-msgstr "'%s' 第 %u 列有無效的時間戳印\n"
+msgstr ""
+#: dirmngr/crlcache.c:692
#, c-format
msgid "WARNING: invalid cache file hash in '%s' line %u\n"
-msgstr "警告: '%s' 第 %u 列有無效的快取檔案雜湊\n"
+msgstr ""
+#: dirmngr/crlcache.c:698
msgid "detected errors in cache dir file\n"
-msgstr "已於快取 dir 檔案內偵測到錯誤\n"
+msgstr ""
+#: dirmngr/crlcache.c:699
msgid "please check the reason and manually delete that file\n"
-msgstr "請檢查其原因並手動刪除該檔案\n"
+msgstr ""
+#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
#, c-format
msgid "failed to create temporary cache dir file '%s': %s\n"
-msgstr "建立暫存快取目錄檔案 '%s' 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:937
#, c-format
msgid "error closing '%s': %s\n"
-msgstr "關閉 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:949
#, c-format
msgid "error renaming '%s' to '%s': %s\n"
-msgstr "把 '%s' 重新命名成 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1003
#, c-format
msgid "can't hash '%s': %s\n"
-msgstr "無法計算 '%s' 的雜湊: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1011
#, c-format
msgid "error setting up MD5 hash context: %s\n"
-msgstr "設定 MD5 雜湊脈絡時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1027
#, c-format
msgid "error hashing '%s': %s\n"
-msgstr "計算 '%s' 的雜湊時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1055
#, c-format
msgid "invalid formatted checksum for '%s'\n"
-msgstr "無效的 '%s' 格式化加總檢核碼\n"
+msgstr ""
+#: dirmngr/crlcache.c:1108
msgid "too many open cache files; can't open anymore\n"
-msgstr "太多開啟的快取檔案; 無法再開啟更多檔案了\n"
+msgstr ""
+#: dirmngr/crlcache.c:1126
#, c-format
msgid "opening cache file '%s'\n"
-msgstr "開啟快取檔案 '%s' 時失敗\n"
+msgstr ""
+#: dirmngr/crlcache.c:1145
#, c-format
msgid "error opening cache file '%s': %s\n"
-msgstr "開啟快取檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1154
#, c-format
msgid "error initializing cache file '%s' for reading: %s\n"
-msgstr "初始化快取檔案 '%s' 用於讀取時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1175
msgid "calling unlock_db_file on a closed file\n"
-msgstr "正在對已關閉的檔案叫用 unlock_db_file\n"
+msgstr ""
+#: dirmngr/crlcache.c:1177
msgid "calling unlock_db_file on an unlocked file\n"
-msgstr "正在對已解除鎖定的檔案叫用 unlock_db_file\n"
+msgstr ""
+#: dirmngr/crlcache.c:1231
#, c-format
msgid "failed to create a new cache object: %s\n"
-msgstr "建立新快取物件失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1286
#, c-format
msgid "no CRL available for issuer id %s\n"
-msgstr "發行者 ID %s 沒有可用的 CRL\n"
+msgstr ""
+#: dirmngr/crlcache.c:1293
#, c-format
msgid "cached CRL for issuer id %s too old; update required\n"
-msgstr "發行者 ID %s 的快取 CRL 太過老舊; 需要更新\n"
+msgstr ""
+#: dirmngr/crlcache.c:1307
#, c-format
msgid ""
"force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@@ -9051,1155 -7395,928 +9036,1161 @@@ msgid "
"The process returns 0 if the certificate is valid, 1 if it is\n"
"not valid and other error codes for general failures\n"
msgstr ""
-"語法: dirmngr-client [選項] [憑證檔案|模式]\n"
-"以 CRL 測試 X.509 憑證, 或進行 OCSP 檢查\n"
-"如果憑證有效, 此程序將傳回 0; 如果憑證無效\n"
-"則傳回 1; 其他錯誤代碼則代表不同的一般性失敗\n"
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
#, c-format
msgid "error reading certificate from stdin: %s\n"
-msgstr "從標準輸入讀取憑證時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
-msgstr "從 '%s' 讀取憑證時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
-msgstr "憑證大到全然不合理的境界\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:310
#, c-format
msgid "can't connect to the dirmngr: %s\n"
-msgstr "無法連接至 dirmngr: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:332
#, c-format
msgid "lookup failed: %s\n"
-msgstr "查找失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:347
#, c-format
msgid "loading CRL '%s' failed: %s\n"
-msgstr "載入 CRL '%s' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:375
msgid "a dirmngr daemon is up and running\n"
-msgstr "有個 dirmngr 服務已啟動並正在執行中\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:397
#, c-format
msgid "validation of certificate failed: %s\n"
-msgstr "憑證之驗證失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
msgid "certificate is valid\n"
-msgstr "憑證有效\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
msgid "certificate has been revoked\n"
-msgstr "憑證已遭撤銷\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
#, c-format
msgid "certificate check failed: %s\n"
-msgstr "憑證檢查失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:428
#, c-format
msgid "got status: '%s'\n"
-msgstr "得到狀態: '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:443
#, c-format
msgid "error writing base64 encoding: %s\n"
-msgstr "寫入 base64 編碼時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:701
#, c-format
msgid "unsupported inquiry '%s'\n"
-msgstr "未支援的查詢 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:803
msgid "absolute file name expected\n"
-msgstr "應該要有絕對檔名\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:848
#, c-format
msgid "looking up '%s'\n"
-msgstr "正在查找 '%s'\n"
+msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
-msgstr "列出 CRL 快取的內容"
+msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
-msgstr "|檔案|從指定檔案載入 CRL 至快取"
+msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
-msgstr "|網址|從指定網址取得 CRL"
+msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
-msgstr "關閉 dirmngr"
+msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
-msgstr "清除快取"
+msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
-msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
+msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
-msgstr "以不詢問使用者的方式執行"
+msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
-msgstr "強迫載入過時的 CRL"
+msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
-msgstr "允許送出 OCSP 請求"
+msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
-msgstr "避免使用 HTTP"
+msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
-msgstr "避免使用 LDAP"
+msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
-msgstr "忽略 HTTP CRL 分布點"
+msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
-msgstr "忽略 LDAP CRL 分布點"
+msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
-msgstr "忽略含有 OCSP 伺服器網址的憑證"
+msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
-msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
+msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
-msgstr "|主機|指定 LDAP 查詢主機"
+msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
-msgstr "不要將主機備案與 --ldap-proxy 並用"
+msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
-msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
+msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
-msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
+msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
-msgstr "|N|把 LDAP 逾時設成 N 秒"
+msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
-msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
+msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
-msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
+msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
-msgstr "|N|單次查詢不要傳回超過 N 筆項目"
+msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
+msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
"options)\n"
msgstr ""
-"@\n"
-"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
-msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
+msgstr ""
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
-"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
-"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
-msgstr "有效的除錯等級為: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
-msgstr "用法: %s [選項] "
+msgstr ""
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
-msgstr "socket 名稱內不允許使用冒號\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
-msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
-msgstr "%s:%u: 列太長 - 已跳過\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
-msgstr "%s:%u: 偵測到無效的指紋\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
-msgstr "%s:%u: 讀取錯誤: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
-msgstr "%s:%u: 列尾的垃圾已忽略\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
-msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
-msgstr "收到 SIGUSR2 - 無定義行動\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
-msgstr "收到 SIGTERM - 正在關閉 ...\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
-msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
-msgstr "已強迫關閉\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
-msgstr "收到 SIGINT - 立即關閉\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
-msgstr "收到訊號 %d - 無定義行動\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:138
msgid "return all values in a record oriented format"
-msgstr "以記錄導向格式傳回所有數值"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:141
msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|名稱|忽略主機的部份並改以指定名稱連線"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:142
msgid "|NAME|connect to host NAME"
-msgstr "|名稱|連線至位於指定名稱的主機"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:143
msgid "|N|connect to port N"
-msgstr "|N|連線至 N 連接埠"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:144
msgid "|NAME|use user NAME for authentication"
-msgstr "|名字|使用指定名字做為認證用的使用者名稱"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:145
msgid "|PASS|use password PASS for authentication"
-msgstr "|密碼|使用指定密碼作為認證"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:147
msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "從 $DIRMNGR_LDAP_PASS 取得密碼使用"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:148
msgid "|STRING|query DN STRING"
-msgstr "|字串|以只指定字串查詢 DN"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:149
msgid "|STRING|use STRING as filter expression"
-msgstr "|字串|以指定字串作為過濾器表示式"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:150
msgid "|STRING|return the attribute STRING"
-msgstr "|字串|以指定字串傳回屬性"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:209
msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "用法: dirmngr_ldap [選項] [網址] (或用 -h 求助)\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:212
msgid ""
"Syntax: dirmngr_ldap [options] [URL]\n"
"Internal LDAP helper for Dirmngr\n"
"Interface and options may change without notice\n"
msgstr ""
-"語法: dirmngr_ldap [選項] [網址]\n"
-"Dirmngr 的內部 LDAP 協助程式\n"
-"介面及選項均可能未經通知即變更\n"
+#: dirmngr/dirmngr_ldap.c:337
#, c-format
msgid "invalid port number %d\n"
-msgstr "無效的連接埠號碼 %d\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:413
#, c-format
msgid "scanning result for attribute '%s'\n"
-msgstr "正在掃描屬性 '%s' 之結果\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
#, c-format
msgid "error writing to stdout: %s\n"
-msgstr "寫入標準輸出時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:437
#, c-format
msgid " available attribute '%s'\n"
-msgstr " 可用屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:475
#, c-format
msgid "attribute '%s' not found\n"
-msgstr "找不到屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:482
#, c-format
msgid "found attribute '%s'\n"
-msgstr "找到屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:591
#, c-format
msgid "processing url '%s'\n"
-msgstr "正在處理網址 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:593
#, c-format
msgid " user '%s'\n"
-msgstr " 使用者 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:595
#, c-format
msgid " pass '%s'\n"
-msgstr " 密碼 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:597
#, c-format
msgid " host '%s'\n"
-msgstr " 主機 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:598
#, c-format
msgid " port %d\n"
-msgstr " 連接埠 %d\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:600
#, c-format
msgid " DN '%s'\n"
-msgstr " 域名 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:602
#, c-format
msgid " filter '%s'\n"
-msgstr " 過濾器 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
#, c-format
msgid " attr '%s'\n"
-msgstr " 屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:616
#, c-format
msgid "no host name in '%s'\n"
-msgstr "'%s' 中沒有主機名稱\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:621
#, c-format
msgid "no attribute given for query '%s'\n"
-msgstr "查詢 '%s' 無給定屬性\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:627
msgid "WARNING: using first attribute only\n"
-msgstr "警告: 僅使用第一個屬性\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:636
#, c-format
msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP 初始至 '%s:%d' 失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:659
#, c-format
msgid "binding to '%s:%d' failed: %s\n"
-msgstr "綁定至 '%s:%d' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:686
#, c-format
msgid "searching '%s' failed: %s\n"
-msgstr "搜尋 '%s' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:718
#, c-format
msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' 不是一個 LDAP 位址\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:724
#, c-format
msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' 是無效的 LDAP 網址\n"
+msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
-msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
++msgstr ""
+
++#: 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 ""
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
-msgstr "印出日誌記錄列時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:236
#, c-format
msgid "error reading log from ldap wrapper %d: %s\n"
-msgstr "從 ldap 封裝程式 %d 讀取日誌記錄時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:304
#, c-format
msgid "npth_select failed: %s - waiting 1s\n"
-msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:343
#, c-format
msgid "ldap wrapper %d ready"
-msgstr "ldap 封裝程式 %d 準備妥當"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:352
#, c-format
msgid "ldap wrapper %d ready: timeout\n"
-msgstr "ldap 封裝程式 %d 準備妥當: 逾時\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:355
#, c-format
msgid "ldap wrapper %d ready: exitcode=%d\n"
-msgstr "ldap 封裝程式 %d 準備妥當: 離開代碼=%d\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:364
#, c-format
msgid "waiting for ldap wrapper %d failed: %s\n"
-msgstr "等候 ldap 封裝程式 %d 時失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:376
#, c-format
msgid "ldap wrapper %d stalled - killing\n"
-msgstr "ldap 封裝程式 %d 已卡住 - 正在中止\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:444
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
-msgstr "繁衍 ldap 封裝程式收割執行緒時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
#, c-format
msgid "reading from ldap wrapper %d failed: %s\n"
-msgstr "從 ldap 封裝程式 %d 讀取時失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap.c:91
#, c-format
msgid "invalid char 0x%02x in host name - not added\n"
-msgstr "主機名稱中有無效的字符 0x%02x - 不予加入\n"
+msgstr ""
+#: dirmngr/ldap.c:95
#, c-format
msgid "adding '%s:%d' to the ldap server list\n"
-msgstr "正在加入 '%s:%d' 至 ldap 伺服器清單\n"
+msgstr ""
+#: dirmngr/ldap.c:98 dirmngr/misc.c:512
#, c-format
msgid "malloc failed: %s\n"
-msgstr "動態記憶體配置失敗: %s\n"
+msgstr ""
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: 無效的模式 '%s'\n"
+msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
-msgstr "ldap_search 達到伺服器的尺寸限制\n"
+msgstr ""
+#: dirmngr/misc.c:172
msgid "invalid canonical S-expression found\n"
-msgstr "發現無效的標準型 S-表示式\n"
+msgstr ""
+#: dirmngr/misc.c:196 dirmngr/misc.c:230
#, c-format
msgid "gcry_md_open failed: %s\n"
-msgstr "gcry_md_open 失敗: %s\n"
+msgstr ""
+#: dirmngr/misc.c:201 dirmngr/misc.c:235
#, c-format
msgid "oops: ksba_cert_hash failed: %s\n"
-msgstr "糟了: ksba_cert_hash 失敗: %s\n"
+msgstr ""
+#: dirmngr/misc.c:528
msgid "bad URL encoding detected\n"
-msgstr "偵測到不良的網址編碼\n"
+msgstr ""
+#: dirmngr/ocsp.c:80
#, c-format
msgid "error reading from responder: %s\n"
-msgstr "從回應程式讀取時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:98
#, c-format
msgid "response from server too large; limit is %d bytes\n"
-msgstr "來自伺服器的回應太大; 上限是 %d 位元組\n"
+msgstr ""
-#, fuzzy
-#| msgid "OCSP request not possible due to disabled HTTP\n"
+#: dirmngr/ocsp.c:139
msgid "OCSP request not possible due to Tor mode\n"
-msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
+msgstr ""
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
-msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
+msgstr ""
+#: dirmngr/ocsp.c:152
#, c-format
msgid "error setting OCSP target: %s\n"
-msgstr "設定 OCSP 目標時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:170
#, c-format
msgid "error building OCSP request: %s\n"
-msgstr "建立 OCSP 請求時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:183
#, c-format
msgid "error connecting to '%s': %s\n"
-msgstr "連線至 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:209 dirmngr/ocsp.c:257
#, c-format
msgid "error reading HTTP response for '%s': %s\n"
-msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr ""
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
-msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:290 dirmngr/ocsp.c:300
#, c-format
msgid "OCSP responder at '%s' status: %s\n"
-msgstr "位於 '%s' 的 OSCP 回應程式狀態: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:295
#, c-format
msgid "hashing the OCSP response for '%s' failed: %s\n"
-msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:330
msgid "not signed by a default OCSP signer's certificate"
-msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
+msgstr ""
+#: dirmngr/ocsp.c:415
msgid "only SHA-1 is supported for OCSP responses\n"
-msgstr "OCSP 回應僅支援 SHA-1\n"
+msgstr ""
+#: dirmngr/ocsp.c:466
#, c-format
msgid "allocating list item failed: %s\n"
-msgstr "配置清單項目時失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:481
#, c-format
msgid "error getting responder ID: %s\n"
-msgstr "取得回應程式 ID 時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:516
msgid "no suitable certificate found to verify the OCSP response\n"
-msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
+msgstr ""
+#: dirmngr/ocsp.c:555 dirmngr/validate.c:648
#, c-format
msgid "issuer certificate not found: %s\n"
-msgstr "找不到發行者憑證: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:565
msgid "caller did not return the target certificate\n"
-msgstr "叫用者未傳為目標憑證\n"
+msgstr ""
+#: dirmngr/ocsp.c:572
msgid "caller did not return the issuing certificate\n"
-msgstr "叫用者未傳回發行的憑證\n"
+msgstr ""
+#: dirmngr/ocsp.c:582
#, c-format
msgid "failed to allocate OCSP context: %s\n"
-msgstr "配置 OCSP 脈絡失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:616
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
-msgstr "無法取得 authorityInfoAccess: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:623
msgid "no default OCSP responder defined\n"
-msgstr "無定義預設 OCSP 回應程式\n"
+msgstr ""
+#: dirmngr/ocsp.c:629
msgid "no default OCSP signer defined\n"
-msgstr "未定義預設的 OCSP 簽署程式\n"
+msgstr ""
+#: dirmngr/ocsp.c:636
#, c-format
msgid "using default OCSP responder '%s'\n"
-msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
+msgstr ""
+#: dirmngr/ocsp.c:641
#, c-format
msgid "using OCSP responder '%s'\n"
-msgstr "正在使用 %s OCSP 回應程式\n"
+msgstr ""
+#: dirmngr/ocsp.c:648
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
-msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:678
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
-msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:703
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
-msgstr "憑證狀態為: %s (本次=%s 下次=%s)\n"
+msgstr ""
+#: dirmngr/ocsp.c:704
msgid "good"
-msgstr "良好"
+msgstr ""
+#: dirmngr/ocsp.c:710
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
-msgstr "憑證已撤銷於 %s 因: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:745
msgid "OCSP responder returned a status in the future\n"
-msgstr "OCSP 回應程式傳回未來的狀態\n"
+msgstr ""
+#: dirmngr/ocsp.c:757
msgid "OCSP responder returned a non-current status\n"
-msgstr "OCSP 回應程式傳回非當下的狀態\n"
+msgstr ""
+#: dirmngr/ocsp.c:772
msgid "OCSP responder returned an too old status\n"
-msgstr "OCSP 回應程式傳回老舊的狀態\n"
+msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "assuan_inquire(%s) 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
-msgstr "遺失 ldapserver"
+msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
-msgstr "憑證 ID 中遺失 serialno"
+msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
-msgstr "assuan_inquire 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
-msgstr "fetch_cert_by_url 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
-msgstr "start_cert_fetch 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
-msgstr "fetch_next_cert 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
-msgstr "max_replies %d 已超出\n"
+msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
-msgstr "無法配置控制結構: %s\n"
+msgstr ""
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
-msgstr "配置 assuan 脈絡失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
-msgstr "伺服器啟始失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
-msgstr "向 Assuan 註冊指令時失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
-msgstr "Assuan 接受問題: %s\n"
+msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
-msgstr "Assuan 處理時失敗: %s\n"
+msgstr ""
+#: dirmngr/validate.c:238
msgid "accepting root CA not marked as a CA"
-msgstr "接受未標示為 CA 的根 CA"
+msgstr ""
+#: dirmngr/validate.c:264
msgid "CRL checking too deeply nested\n"
-msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
+msgstr ""
+#: dirmngr/validate.c:282
msgid "not checking CRL for"
-msgstr "不對此檢查 CRL:"
+msgstr ""
+#: dirmngr/validate.c:287
msgid "checking CRL for"
-msgstr "檢查 CRL: "
+msgstr ""
+#: dirmngr/validate.c:556
msgid "selfsigned certificate has a BAD signature"
-msgstr "自簽憑證有 不良 簽章"
+msgstr ""
+#: dirmngr/validate.c:590
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
-msgstr "檢查根憑證可信度時失敗: %s\n"
+msgstr ""
+#: dirmngr/validate.c:769
msgid "certificate chain is good\n"
-msgstr "憑證鏈完好\n"
+msgstr ""
+#: dirmngr/validate.c:1169
msgid "certificate should not have been used for CRL signing\n"
-msgstr "憑證應該還未被用於 CRL 簽署\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
msgid "quiet"
-msgstr "安靜模式"
+msgstr ""
+#: tools/gpg-connect-agent.c:79
msgid "print data out hex encoded"
-msgstr "列印資料超出十六進制編碼範圍"
+msgstr ""
+#: tools/gpg-connect-agent.c:80
msgid "decode received data lines"
-msgstr "對已收到的資料列解碼"
+msgstr ""
+#: tools/gpg-connect-agent.c:81
msgid "connect to the dirmngr"
-msgstr "連線至 dirmngr"
+msgstr ""
+#: tools/gpg-connect-agent.c:84
msgid "|NAME|connect to Assuan socket NAME"
-msgstr "|名稱|連線至指定名稱的 Assuan socket"
+msgstr ""
+#: tools/gpg-connect-agent.c:86
msgid "|ADDR|connect to Assuan server at ADDR"
-msgstr "|ADDR|連線至位於 ADDR 的 Assuan 伺服器"
+msgstr ""
+#: tools/gpg-connect-agent.c:88
msgid "run the Assuan server given on the command line"
-msgstr "執行命令列所給定的 Assuan 伺服器"
+msgstr ""
+#: tools/gpg-connect-agent.c:90
msgid "do not use extended connect mode"
-msgstr "不要使用延伸連線模式"
+msgstr ""
+#: tools/gpg-connect-agent.c:92
msgid "|FILE|run commands from FILE on startup"
-msgstr "|檔案|啟動時執行指定檔案中的指令"
+msgstr ""
+#: tools/gpg-connect-agent.c:93
msgid "run /subst on startup"
-msgstr "啟動時執行 /subst"
+msgstr ""
+#: tools/gpg-connect-agent.c:205
msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
-msgstr "用法: @GPG at -connect-agent [選項] (或用 -h 求助)"
+msgstr ""
+#: tools/gpg-connect-agent.c:208
msgid ""
"Syntax: @GPG at -connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-"語法: @GPG at -connect-agent [選項]\n"
-"連線至運作中的代理程式並送出指令\n"
+#: tools/gpg-connect-agent.c:1247
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
-msgstr "\"%s\" 選項需要有程式及選用的引數\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
+#: tools/gpg-connect-agent.c:1270
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
-msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
#, c-format
msgid "receiving line failed: %s\n"
-msgstr "接收列時失敗: %s\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1458
msgid "line too long - skipped\n"
-msgstr "列太長 - 已跳過\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1462
msgid "line shortened due to embedded Nul character\n"
-msgstr "列因嵌入的 Nul 字符而縮短了\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1837
#, c-format
msgid "unknown command '%s'\n"
-msgstr "未知的指令 '%s'\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1855
#, c-format
msgid "sending line failed: %s\n"
-msgstr "送出列時失敗: %s\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
-msgstr "送出標準選項時出錯: %s\n"
+msgstr ""
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
-msgstr "控制著診斷性輸出的選項"
+msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
-msgstr "控制著組態的選項"
+msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
-msgstr "對除錯有幫助的選項"
+msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
-msgstr "控制著安全性的選項"
+msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
+msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
+msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
+msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
-msgstr "強制執行密語原則的選項"
+msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
-msgstr "不允許略過密語原則"
+msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|把新密語所需的最短長度設成 N"
+msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|新密語至少要有 N 個非字母的字符"
+msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
+msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
-msgstr "|N|在 N 天之後讓密語過期"
+msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
-msgstr "不允許重複使用舊密語"
+msgstr ""
- #: tools/gpgconf-comp.c:591
-#, fuzzy
-#| msgid "|N|set LDAP timeout to N seconds"
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|把 LDAP 逾時設成 N 秒"
+msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
-msgstr "|名字|使用指定名字做為預設私鑰"
+msgstr ""
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|名字|也加密給指定名字的使用者 ID"
+msgstr ""
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|設定電子郵件別名"
+msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
-msgstr "金鑰伺服器組態"
+msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
-msgstr "|URL|使用位於 URL 的金鑰伺服器"
+msgstr ""
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
-msgstr "允許 PKA 查找 (DNS 請求)"
+msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
+msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
-msgstr "停用所有的 dirmngr 存取"
+msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
+msgstr ""
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
-msgstr "不要為根憑證檢查 CRL"
+msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
-msgstr "控制著輸出格式的選項"
+msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
-msgstr "控制著互動及強制執行的選項"
+msgstr ""
- #: tools/gpgconf-comp.c:943
-#, fuzzy
-#| msgid "Options controlling the security"
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
-msgstr "控制著安全性的選項"
+msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
-msgstr "HTTP 伺服器組態"
+msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
-msgstr "使用系統的 HTTP 代理伺服器設定"
+msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
-msgstr "要用的 LDAP 伺服器組態"
+msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
-msgstr "LDAP 伺服器清單"
+msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
-msgstr "OCSP 組態"
+msgstr ""
- #: tools/gpgconf-comp.c:1091
-#, fuzzy
-#| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
-msgstr "OpenPGP 版 GPG"
+msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
-#, fuzzy
-#| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
-msgstr "智慧卡服務"
+msgstr ""
- #: tools/gpgconf-comp.c:1094
-#, fuzzy
-#| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
-msgstr "S/MIME 版 GPG"
+msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1096
-#, fuzzy
-#| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1100
msgid "Passphrase Entry"
-msgstr "個人識別碼及密語項目"
+msgstr ""
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
-msgstr "元件不適合啟動"
+msgstr ""
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
-msgstr "元件 %s 的外部驗證失敗"
+msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
-msgstr "請注意群組規格已忽略\n"
+msgstr ""
- #: tools/gpgconf-comp.c:4135
-#, fuzzy, c-format
-#| msgid "error closing '%s': %s\n"
++#: tools/gpgconf-comp.c:4139
+#, c-format
msgid "error closing '%s'\n"
-msgstr "關閉 '%s' 時出錯: %s\n"
+msgstr ""
- #: tools/gpgconf-comp.c:4137
-#, fuzzy, c-format
-#| msgid "error hashing '%s': %s\n"
++#: tools/gpgconf-comp.c:4141
+#, c-format
msgid "error parsing '%s'\n"
-msgstr "計算 '%s' 的雜湊時出錯: %s\n"
+msgstr ""
+#: tools/gpgconf.c:73
msgid "list all components"
-msgstr "列出所有的元件"
+msgstr ""
+#: tools/gpgconf.c:74
msgid "check all programs"
-msgstr "檢查所有的程式"
+msgstr ""
+#: tools/gpgconf.c:75
msgid "|COMPONENT|list options"
-msgstr "|元件|列出選項"
+msgstr ""
+#: tools/gpgconf.c:76
msgid "|COMPONENT|change options"
-msgstr "|元件|變更選項"
+msgstr ""
+#: tools/gpgconf.c:77
msgid "|COMPONENT|check options"
-msgstr "|元件|檢查選項"
+msgstr ""
+#: tools/gpgconf.c:79
msgid "apply global default values"
-msgstr "套用全域預設值"
+msgstr ""
-#, fuzzy
-#| msgid "|FILE|take policy information from FILE"
+#: tools/gpgconf.c:81
msgid "|FILE|update configuration files using FILE"
-msgstr "|檔案|從指定檔案中取得原則資訊"
+msgstr ""
+#: tools/gpgconf.c:83
msgid "get the configuration directories for @GPGCONF@"
-msgstr "取得 @GPGCONF@ 的組態目錄"
+msgstr ""
+#: tools/gpgconf.c:85
msgid "list global configuration file"
-msgstr "列出全域組態檔"
+msgstr ""
+#: tools/gpgconf.c:87
msgid "check global configuration file"
-msgstr "檢查全域組態檔案"
+msgstr ""
-#, fuzzy
-#| msgid "update the trust database"
+#: tools/gpgconf.c:89
msgid "query the software version database"
-msgstr "更新信任資料庫"
+msgstr ""
+#: tools/gpgconf.c:90
msgid "reload all or a given component"
-msgstr "重新載入所有或給定的元件"
+msgstr ""
+#: tools/gpgconf.c:91
msgid "launch a given component"
-msgstr "啟動給定的元件"
+msgstr ""
+#: tools/gpgconf.c:92
msgid "kill a given component"
-msgstr "刪除給定的元件"
+msgstr ""
+#: tools/gpgconf.c:98
msgid "use as output file"
-msgstr "當作輸出檔案來使用"
+msgstr ""
+#: tools/gpgconf.c:102
msgid "activate changes at runtime, if possible"
-msgstr "如果可能的話, 在執行期啟用變更"
+msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
-msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
+msgstr ""
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
-"語法: @GPGCONF@ [選項]\n"
-"管理 @GNUPG@ 系統工具的組態選項\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
-msgstr "需要一個元件引數"
+msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
-msgstr "找不到元件"
+msgstr ""
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
-msgstr "未允許使用引數"
+msgstr ""
+#: tools/symcryptrun.c:166
msgid ""
"@\n"
"Commands:\n"
diff --cc po/hu.po
index a803365,fcdc9b7..12ff2df
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -15,7 -14,6 +15,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@@ -26,40 -24,31 +26,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Valóban törli a kiválasztott kulcsokat? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "érvénytelen jelszó
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -77,75 -65,59 +77,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "rossz jelszó"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "A sor túl hosszú!\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "A jelszó túl hosszú!\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Érvénytelen karakter a névben!\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "hibás MPI"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "rossz jelszó"
@@@ -155,152 -126,111 +155,152 @@@
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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "jelszóváltoztatás"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ismételje meg a jelszót: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Ismételje meg a jelszót: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ismételje meg a jelszót: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -379,8 -296,6 +379,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "jelszóváltoztatás"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -390,124 -305,95 +390,128 @@@ msgstr "
"Opciók:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "A kulcsot lecserélték."
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "még szűkszavúbb mód"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|fájl|bővítő modul betöltése"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "kulcsok keresése kulcsszerveren"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "bizalmi adatbázis frissítése"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NÉV|terminál karakterkódolásának megadása"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nem támogatott"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,179 -402,136 +520,184 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozható létre: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: Nem tudom a könyvtárat létrehozni: %s.\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -539,6 +705,9 @@@ msgstr "
"@Parancsok:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -752,8 -584,6 +761,8 @@@ msgstr "Mégsem
msgid "error while asking for the passphrase: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -812,8 -633,6 +821,8 @@@ msgstr "
msgid "Yes"
msgstr "igen"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -864,19 -676,16 +873,19 @@@ msgstr "jelszóváltoztatás
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "kulcs engedélyezése"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -896,7 -702,6 +905,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
@@@ -937,8 -732,6 +946,8 @@@ msgstr "Hiba a jelszó létrehozásakor
msgid "error creating a stream for a pipe: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -1066,7 -833,6 +1075,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
@@@ -1081,7 -845,6 +1090,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1196,8 -936,6 +1205,8 @@@ msgstr "%s: Kulcskarikát létrehoztam.
msgid "algorithm: %s"
msgstr "Páncél: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1389,7 -1089,6 +1398,7 @@@ msgstr "Érvénytelen import opciók!\n
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "Érvénytelen import opciók!\n"
@@@ -1414,7 -1109,6 +1423,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "nem feldolgozott"
@@@ -1473,8 -1156,6 +1482,8 @@@ msgstr "A(z) %08lX nyilvános kulcsot n
msgid "waiting for lock %s...\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1606,7 -1261,6 +1615,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "FIGYELEM: Érvénytelen jelölő adatot találtam.\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1615,35 -1268,33 +1624,42 @@@
msgid "Enter passphrase: "
msgstr "Írja be a jelszót: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s és %s egyelőre nem használható együtt!\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "titkos kulcs nem áll rendelkezésre"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
@@@ -1653,15 -1303,10 +1669,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Ez a parancs %s módban nem engedélyezett.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Mit választ? "
@@@ -1723,154 -1355,107 +1739,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "preferenciák frissítése"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "Érvénytelen karakter a preferenciák között!\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "Érvénytelen karakter a preferenciák között!\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "megmutatja az ujjlenyomatot"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Kulcsgenerálás sikertelen: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "Nem találtam érvényes OpenPGP adatot.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Milyen kulcsméretet szeretne? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Milyen kulcsméretet szeretne? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Milyen kulcsméretet szeretne? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "Felkerekítve %u bitre.\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "Kihagytam: titkos kulcs már jelen van.\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1878,179 -1463,135 +1879,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Az aláírás lejárt: %s.\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (csak titkosítás)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Érvénytelen választás.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Kérem, válassza ki a visszavonás okát:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Ez a parancs %s módban nem engedélyezett.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Kihagytam: titkos kulcs már jelen van.\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Valóban aláírja? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "kilépés ebből a menüből"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "Egymásnak ellentmondó parancsok!\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "megmutatja ezt a súgót"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Kulcs található: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "lejárat megváltoztatása"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "kulcstulajdonos megbízhatóságának beállítása"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "új kulcspár létrehozása"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "Egymásnak ellentmondó parancsok!\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "Egymásnak ellentmondó parancsok!\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@@ -2112,83 -1641,78 +2113,96 @@@ msgstr "Van egy titkos kulcs a \"%s\" n
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "Először azt törölje a \"--delete-secret-keys\" opcióval!\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "Nem tudok szimmetrikus ESK csomagot használni a S2K mód miatt!\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "%s rejtjelezést használok.\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" már tömörített.\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "FIGYELEM: A(z) \"%s\" állomány üres.\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "Olvasok a \"%s\" állományból.\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr ""
+ "Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "A %s (%d) tömörítés használata sérti a címzett preferenciáit!\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s titkosítva \"%s\" számára\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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s titkosított adat.\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"FIGYELEM: Az üzenet szimmetrikus titkosítását gyenge kulccsal végezték.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "Probléma a titkosított csomag kezelésekor!\n"
@@@ -2279,40 -1786,31 +2293,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: kihagyva: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "Írok a \"%s\" állományba.\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem exportáltam.\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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,236 -1867,188 +2396,241 @@@ msgstr "|NÉV|NÉV használata alapért
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "Érvénytelen import opciók!\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "különálló aláírás készítése"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fájl]|olvasható szöveg aláírása"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "különálló aláírás készítése"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "adat titkosítása"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "titkosítás csak szimmetrikus rejtjelezővel"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "adat visszafejtése (alapértelmezés)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "aláírás ellenőrzése"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "kulcsok listázása"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "kulcsok és aláírások listázása"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "kulcsaláírások ellenőrzése"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "kulcsok és ujjlenyomatok listázása"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "titkos kulcsok listázása"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "visszavonási igazolás készítése"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "kulcs aláírása"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "kulcs aláírása helyileg"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "kulcs aláírása"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "kulcs aláírása helyileg"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "kulcs aláírása vagy szerkesztése"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "jelszóváltoztatás"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "kulcsok exportálása"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "kulcsok exportálása kulcsszerverre"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "kulcsok importálása kulcsszerverről"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "kulcsok keresése kulcsszerveren"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "minden kulcs frissítése kulcsszerverről"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "kulcsok importálása/összefűzése"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "bizalmi adatbázis frissítése"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "ascii páncélozott kimenet létrehozása"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NÉV|titkosítás NÉV részére"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, 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:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "kanonikus szöveges mód használata"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|fájl|bővítő modul betöltése"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ne csináljon semmi változtatást"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "felülírás előtt rákérdezés"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2619,7 -2056,6 +2638,7 @@@ msgstr "
"@\n"
"(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2649,13 -2085,11 +2668,13 @@@ msgstr "
" --list-keys [nevek] kulcsok kiíratása\n"
" --fingerprint [nevek] ujjlenyomatok kiíratása\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2670,7 -2104,6 +2689,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:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2678,548 -2111,416 +2697,529 @@@ msgstr "
"\n"
"Támogatott algoritmusok:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Nyilvános kulcsú (pubkey): "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Rejtjelező (cipher): "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Kivonatoló (hash): "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Tömörítő (compression): "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "Használat: gpg [opciók] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "Egymásnak ellentmondó parancsok!\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, 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:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: Érvénytelen import opciók!\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: Érvénytelen import opciók!\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, 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:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s és %s nem használható együtt!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s értelmetlen %s mellett!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "Érvénytelen alapértelmezett preferenciák!\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, 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: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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr ""
"Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "Lehet, hogy nem használhatja \"%s\" tömörítő algoritmust %s módban!\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Visszafejtés sikertelen: %s.\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexportálás sikertelen: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Páncél eltávolítása nem sikerült: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Páncélozás nem sikerült: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti gépelni az üzenetet...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
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:5283
++#: g10/gpg.c:5329
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:5316
++#: g10/gpg.c:5362
#, 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"
@@@ -3233,7 -2532,6 +3233,7 @@@ msgstr "a megadott kulcskarikáról veg
msgid "make timestamp conflicts only a warning"
msgstr "időbélyeg-konfliktus esetén csak figyelmeztessen"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
@@@ -3264,332 -2557,269 +3264,337 @@@ msgstr "Nem áll rendelkezésre segíts
msgid "No help available for '%s'"
msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "bizalmi adatbázis frissítése"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "bizalmi adatbázis frissítése"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "használhatatlan titkos kulcs"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "megmutatja az ujjlenyomatot"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d típusú blokkot kihagyom.\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Összesen feldolgoztam: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " új kulcsok kihagyva: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " új kulcsok kihagyva: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " felh. azonosító nélkül: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importálva: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " változatlan: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " új felh. azonosítók: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " új alkulcsok: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " új aláírások: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " új kulcsvisszavonások: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importált titkos kulcsok: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "változatlan titkos kulcsok: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nem importált: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " új aláírások: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "%08lX kulcs: HKP alkulcssérülés kijavítva.\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "%08lX kulcs: Nem önaláírt felh. azonosító (\"%s\") elfogadva.\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "%08lX kulcs: Nincs érvényes felhasználói azonosító.\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "Ezt okozhatja egy hiányzó önaláírás.\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "%08lX kulcs: új kulcs - kihagytam.\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "Nem írható kulcskarikát találtam: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "%08lX kulcs: \"%s\" nyilvános kulcs importálva.\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "%08lX kulcs: \"%s\" 1 új aláírás.\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "%08lX kulcs: \"%s\" 1 új alkulcs.\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "%08lX kulcs: \"%s\" %d új alkulcs.\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "%08lX kulcs: \"%s\" nem változott.\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "%08lX kulcs: Titkos kulcs importálva.\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "Kihagytam: titkos kulcs már jelen van.\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "\"%s\" titkos kulcs nem található: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3605,143 -2835,116 +3610,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "%08lX kulcs: Nincs felhasználói azonosító ehhez az aláíráshoz!\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"%08lX kulcs: Nem támogatott nyilvános kulcsú alg. a \"%s\" felh. "
"azonosítón!\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "%08lX kulcs: Érvénytelen önaláírás a \"%s\" felh. azonosítón!\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcskötéshez!\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcskötést.\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcsvisszavonást.\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "%08lX kulcs: Nem exportálható aláírás (%02x. osztály) - kihagytam.\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "%08lX kulcs: Visszavonó igazolás rossz helyen - kihagytam.\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - kihagytam.\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "%08lX kulcs: Váratlan aláírásosztály (0x%02X) - kihagytam.\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefűztem.\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhatták:\n"
"lehívom a %08lX visszavonó kulcsot.\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhatták:\n"
"visszavonó kulcs (%08lX) nincs jelen.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
@@@ -3783,79 -2979,12 +3788,15 @@@ msgstr "Hiba \"%s\" olvasásakor: %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[visszavonás]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[önaláírás]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Jó aláírás a következőtől: \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "Kihagytam \"%s\"-t: %s.\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
- msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
- msgstr[1] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d rossz aláírás.\n"
- msgstr[1] "%d rossz aláírás.\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Jó aláírás a következőtől: \""
- msgstr[1] "Jó aláírás a következőtől: \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3868,68 -2997,53 +3809,68 @@@ msgstr "
"különböző forrásból származó digitális ujjlenyomatokkal...)!\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = részlegesen megbízom benne\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = teljesen megbízom benne\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "\"%s\" felhasználói azonosítót visszavonták."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Nem tudom aláírni.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "\"%s\" felhasználói azonosító lejárt."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Valóban aláírja? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3938,11 -3052,9 +3879,11 @@@ msgstr "
"\"%s\" önaláírása\n"
"PGP 2.x stílusú.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Szeretné átalakítani OpenPGP önaláírássá? (i/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3951,11 -3063,9 +3892,11 @@@ msgstr "
"Az Ön jelenlegi aláírása a(z) \"%s\"\n"
"kulcson lejárt.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Szeretne kiadni egy új aláírást, amellyel lecseréli a lejártat? (i/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3964,43 -3074,34 +3905,43 @@@ msgstr "
"Az Ön jelenlegi aláírása a(z) \"%s\"\n"
"kulcson helyi aláírás.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Szeretné átalakítani teljes, exportálható aláírássá? (i/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" már alá lett írva helyileg a %08lX kulccsal!\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" már alá lett írva a %08lX kulccsal!\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Még egyszer alá akarja írni? (i/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Ez a kulcs lejárt!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Ez a kulcs lejár: %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Szeretné, ha az aláírása ugyanekkor járna le? (I/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4009,32 -3110,26 +3950,32 @@@ msgstr "
"Mennyire gondosan ellenőrizte, hogy a kulcs, melyet aláírni készül, valóban\n"
"a fent nevezett személyhez tartozik? Ha nem tudja a választ, írjon \"0\"-t!\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nem válaszolok.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Egyáltalán nem ellenőriztem.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) A szokásos ellenőrzéseket végeztem.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Nagyon alaposan ellenőriztem.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Mi a válasza? (Adjon meg \"?\"-et magyarázathoz!): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4043,265 -3138,211 +3984,265 @@@ msgstr "
"Teljesen biztos abban, hogy alá akarja írni ezt a kulcsot\n"
"az Ön kulcsával: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ez egy önaláírás lesz.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"FIGYELEM: Az aláírás nem lesz \"nem exportálhatóként\" megjelölve.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"FIGYELEM: Az aláírás nem lesz \"nem visszavonhatóként\" megjelölve.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Az aláírást \"nem exportálhatónak\" jelöljük.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Az aláírást \"nem visszavonhatónak\" jelöljük.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Egyáltalán nem ellenőriztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"A szokásos módon ellenőriztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Nagyon gondosan ellenőriztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Valóban aláírja? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "Aláírás sikertelen: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "mentés és kilépés"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Aláírás-jelölés: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "N. felhasználói azonosító kiválasztása"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "N. felhasználói azonosító kiválasztása"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "aláírások visszavonása"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "kulcs helyi aláírása"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "felhasználói azonosító hozzáadása"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "fotóazonosító hozzáadása"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "felhasználói azonosító törlése"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "másodlagos kulcs törlése"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "visszavonó kulcs hozzáadása"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "felhasználóazonosító megjelölése elsődlegesként"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "preferenciák listázása (szakértő)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "preferenciák listázása (részletes)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "jelszóváltoztatás"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "kulcstulajdonos megbízhatóságának beállítása"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "felhasználói azonosító visszavonása"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "másodlagos kulcs visszavonása"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "kulcs engedélyezése"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "kulcs tiltása"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "fotóazonosító megmutatása"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Titkos kulcs rendelkezésre áll.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Ehhez szükség van a titkos kulcsra.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4309,294 -3350,240 +4250,304 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "A kulcsot visszavonták."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Valóban aláírja az összes felhasználóazonosítót? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Valóban aláírja az összes felhasználóazonosítót? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "ismeretlen aláírásosztály"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Ez a parancs %s módban nem engedélyezett.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Legalább egy felhasználóazonosítót ki kell választania!\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Valóban eltávolítja az összes kijelölt felhasználóazonosítót? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Legalább egy kulcsot ki kell választania!\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Legalább egy kulcsot ki kell választania!\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Valóban törli a kiválasztott kulcsokat? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Valóban törli ezt a kulcsot? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Valóban visszavonja ezt a felhasználóazonosítót? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Valóban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Valóban visszavonja a kijelölt kulcsokat? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Valóban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "preferencialista beállítása"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Valóban frissítsem a preferenciákat? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Mentsem a változtatásokat? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Kilépjek mentés nélkül? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "A kulcs nem változott, nincs szükség frissítésre.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "Érvénytelen érték!\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nincs ilyen felhasználói azonosító.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Kivonat: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Jellemzők: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Jelölés: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (érzékeny)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s nem hozható létre: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[visszavont] "
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [lejár: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [lejár: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Ez a kulcs tiltott."
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4604,20 -3591,14 +4555,20 @@@ msgstr "
"Kérem, vegye figyelembe, hogy az itt látható kulcs érvényessége nem\n"
"feltétlenül helyes, amíg újra nem indítja a programot!\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4625,17 -3606,14 +4576,17 @@@ msgstr "
"FIGYELEM: Nincs kijelölt elsődleges felhasználóazonosító. Ez a parancs\n"
" azt okozhatja, hogy egy másik azonosító lesz elsődlegesként használva.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4645,35 -3623,27 +4596,35 @@@ msgstr "
"okozhatja,\n"
" hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Továbbra is hozzá akarja adni? (i/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Törli ezt a jó aláírást? (i/N/k)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Valóban törli ezt az önaláírást? (i/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4681,38 -3651,31 +4632,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Töröltem %d aláírást.\n"
msgstr[1] "Töröltem %d aláírást.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nem töröltem semmit.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "érvénytelen páncél"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "\"%s\" felhasználói azonosítót visszavonták."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4722,219 -3685,178 +4673,224 @@@ msgstr "
" azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
"kulcsot!\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Kérem, válasszon ki pontosan egy felhasználóazonosítót!\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Biztos abban, hogy használni akarja (i/N)? "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Biztos abban, hogy használni akarja (i/N)? "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Aláírás-jelölés: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Felülírjam (i/N)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nincs %d indexű felhasználóazonosító!\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nincs %d indexű felhasználóazonosító!\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nincs %d indexű felhasználóazonosító!\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nincs %d indexű felhasználóazonosító!\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "Felhasználóazonosító: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " aláírva %08lX által %s%s%s időpontban.\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (nem exportálható)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Ez az aláírás lejárt %s időpontban.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " aláírva %08lX által %s%s időpontban.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Ön aláírta a következő felhasználóazonosítókat:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (nem exportálható)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " visszavonva %08lX által %s időpontban.\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "A következő aláírásokat fogja visszavonni:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "Nincs titkos kulcs.\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"FIGYELEM: A felhasználóazonosítót %d másodperccel a jövőben írták alá.\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "Érvénytelen import opciók!\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "%c%lu preferencia kétszer szerepel!\n"
@@@ -5382,8 -4227,6 +5338,8 @@@ msgstr "
"a lemezeket) a prímszám generálása alatt. Ez segíti a véletlenszám-\n"
"generátort, hogy entrópiát tudjon gyűjteni.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgenerálás sikertelen: %s\n"
@@@ -5457,7 -4287,6 +5413,7 @@@ msgstr "Hiba a(z) \"%s\" nyilvánoskulc
msgid "public and secret key created and signed.\n"
msgstr "A nyilvános és titkos kulcsokat létrehoztam és aláírtam.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5467,66 -4296,53 +5423,66 @@@ msgstr "
"kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n"
"teheti meg.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MEGJEGYZÉS: Alkulcsok létrehozása v3 kulcsokhoz nem OpenPGP-megfelelő.\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Az elsődleges kulcs titkos részei nem elérhetők.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Az elsődleges kulcs titkos részei nem elérhetők.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Valóban létrehozzam? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "soha "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritikus aláírási eljárásmód: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Aláírási eljárásmód: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kritikus aláírás-jelölés: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Aláírás-jelölés: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5534,7 -4350,20 +5490,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d rossz aláírás.\n"
msgstr[1] "%d rossz aláírás.\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d rossz aláírás.\n"
+ msgstr[1] "%d rossz aláírás.\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
+ msgstr[1] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5542,41 -4371,33 +5514,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 aláírást nem ellenőriztem hiba miatt.\n"
msgstr[1] "1 aláírást nem ellenőriztem hiba miatt.\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Kulcskarika"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Elsődlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Elsődlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Kulcs ujjlenyomata ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5687,267 -4487,218 +5659,273 @@@ msgstr "\"%s\" kulcs nem található: %
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"Aláírva az Ön %08lX kulcsával %s időpontban.\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr ""
"FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "Furcsa méretű (%d) titkosított munkafolyamatkulcs.\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s titkosított munkafolyamatkulcs\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "Nyilvános kulcs: %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "Nyilvános kulccsal titkosított adat: jó DEK.\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "Titkosítva %u bites %s kulccsal, azonosító: %08lX, létrehozva: %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " azaz \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Nyilvános kulcsú visszafejtés sikertelen: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu jelszóval rejtjelezve\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "1 jelszóval rejtjelezve\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s titkosított adatot feltételezek.\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA rejtjelező nem áll rendelkezésre, optimista módon megpróbálok\n"
"%s-t használni helyette.\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "FIGYELEM: Az üzenetet nem látták el integritásvédelemmel.\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "Visszafejtés rendben.\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "Visszafejtés sikertelen: %s.\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "MEGJEGYZÉS: A feladó kérése: \"csak az Ön szemeinek\".\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Eredeti fájlnév: '%.*s'.\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Különálló visszavonás. Használja a \"gpg --import\"-ot az alkalmazásához!\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Jó aláírás a következőtől: \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ROSSZ aláírás a következőtől: \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Lejárt aláírás a következőtől: \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Jó aláírás a következőtől: \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "Aláírás-ellenőrzés elnyomva.\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "Nem tudom kezelni ezeket a többszörös aláírásokat!\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Az aláírás lejárt: %s.\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " azaz \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " azaz \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Kulcs található: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[bizonytalan]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " azaz \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "FIGYELEM: Ez a kulcs nincs hitelesítve megbízható aláírással!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Az aláírás lejárt: %s.\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Az aláírás lejár: %s.\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "Bináris"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "Szövegmódú"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "Ismeretlen módú"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "ismeretlen nyilvános kulcsú algoritmus"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "Nem különálló aláírás.\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "FIGYELEM: Többszörös aláírást érzékeltem. Csak az elsőt ellenőrzöm.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x osztályú különálló aláírás.\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
@@@ -6010,67 -4750,54 +5988,67 @@@ msgstr "Olvasási hiba: %s.\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: Elavult opció: \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Kérem, ezt használja helyette: \"%s%s\"\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "tömörítetlen"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "tömörítetlen"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "ismeretlen aláírásosztály"
@@@ -6586,35 -5214,32 +6564,40 @@@ msgstr "Nem tudom megnyitni a(z) \"%s\
msgid "can't open signed data fd=%d: %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "Anonim címzett. A %08lX titkos kulcsot próbálom...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "Rendben, mi vagyunk az anonim címzett.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "A DEK régi kódolása nem támogatott.\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "A %d%s rejtjelező algoritmus ismeretlen vagy tiltott.\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "MEGJEGYZÉS: %d rejtjelező algoritmus nincs a preferenciák között.\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6775,7 -5372,6 +6758,7 @@@ msgstr "(Nincs leírás.)\n
msgid "Is this okay? (y/N) "
msgstr "Ez így rendben van? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "Gyenge kulcs jött létre. Újrapróbálom.\n"
@@@ -6796,40 -5389,38 +6779,46 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "FIGYELEM: Aláíráskivonat-konfliktus az üzenetben.\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
+
++#: g10/sig-check.c:191
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = további információkat kérek\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "FIGYELEM: %08lX aláíró alkulcson érvénytelen kereszthitelesítés van.\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
msgstr[1] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
msgstr[1] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6840,7 -5431,6 +6829,7 @@@ msgstr[0] "
msgstr[1] ""
"A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6850,41 -5440,34 +6839,41 @@@ msgstr[0] "
msgstr[1] ""
"A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "MEGJEGYZÉS: Aláíró kulcs (%08lX) lejárt: %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"Rossz aláírást feltételezek a %08lX kulcstól egy ismeretlen\n"
"kritikus bit miatt.\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavonó csomaghoz.\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "%08lX kulcs: Nincs alkulcs az alkulcskötő aláíráshoz!\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"FIGYELEM: Nem tudom kifejteni a %% jeleket a jelölésben (túl hosszú).\n"
"Kifejtés nélkül használom.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6893,7 -5476,6 +6882,7 @@@ msgstr "
"hosszú).\n"
"Kifejtés nélkül használom.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6903,12 -5485,10 +6892,12 @@@ msgstr "
"hosszú).\n"
"Kifejtés nélkül használom.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s aláírás a következőtől: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6916,31 -5496,25 +6905,31 @@@ msgstr "
"%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
"a címzett preferenciáival.\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "Aláírom:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s titkosítást fogok használni.\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"-t kihagytam: másodpéldány.\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "Kihagytam: titkos kulcs már jelen van.\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7029,7 -5587,6 +7018,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
@@@ -7141,149 -5676,120 +7130,149 @@@ msgstr "Nem tudok %d karakternél hossz
msgid "input line longer than %d characters\n"
msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Támogatott algoritmusok:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Eljárásmód: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "kulcsok listázása"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7291,68 -5797,58 +7280,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "%lu jelszóval rejtjelezve\n"
msgstr[1] "%lu jelszóval rejtjelezve\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
@@@ -7360,149 -5856,123 +7349,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, 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:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "%lu jelszóval rejtjelezve\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Eljárásmód: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7519,18 -5989,14 +7508,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7767,19 -6188,14 +7756,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7828,44 -6235,35 +7817,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@@ -7873,54 -6271,43 +7862,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "jelszóváltoztatás"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7930,26 -6317,21 +7919,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "jelszóváltoztatás"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "jelszóváltoztatás"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Kérem, válassza ki a visszavonás okát:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7957,117 -6339,93 +7946,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "jelszóváltoztatás"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "jelszóváltoztatás"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" már tömörített.\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "új kulcspár létrehozása"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "új kulcspár létrehozása"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "nem támogatott URI"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Kulcsgenerálás sikertelen: %s\n"
msgstr[1] "Kulcsgenerálás sikertelen: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@@ -8088,11 -6443,9 +8077,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|fájl|bővítő modul betöltése"
@@@ -8148,12 -6490,10 +8137,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8228,9 -6553,6 +8217,9 @@@ msgstr "Hiba a jelszó létrehozásakor
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@@ -8417,7 -6699,6 +8406,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8462,7 -6736,6 +8451,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@@ -8726,11 -6946,9 +8715,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8759,139 -6972,108 +8748,139 @@@ msgstr "%c%lu preferencia kétszer szer
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Nincs leírás.)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "titkos kulcsok listázása"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "rossz igazolás"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "rossz igazolás"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "rossz igazolás"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ascii páncélozott kimenet létrehozása"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "ne használja a terminált egyáltalán"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|fájl|bővítő modul betöltése"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "kötegelt mód: soha nem kérdez"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "igen válasz feltételezése a legtöbb kérdésre"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "nem válasz feltételezése a legtöbb kérdésre"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "kulcskarika hozzáadása a kulcskarikalistához"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8902,47 -7084,38 +8891,47 @@@ msgstr "
"Aláírás, ellenőrzés, titkosítás vagy visszafejtés.\n"
"Az alapértelmezett művelet a bemeneti adattól függ.\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Nincs leírás.)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " h = kulcs kihagyása\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "Írok a \"%s\" állományba.\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9005,7 -7166,6 +8994,7 @@@ msgstr "rev? Nem tudom ellenőrizni a v
msgid "error storing flags: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9034,7 -7190,6 +9023,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9048,51 -7202,41 +9037,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "%d%s védő algoritmus nem támogatott.\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Az aláírás lejárt: %s.\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Jó aláírás a következőtől: \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " azaz \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9893,116 -7876,88 +9882,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|fájl|bővítő modul betöltése"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Kilépjek mentés nélkül? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|fájl|bővítő modul betöltése"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10015,91 -7970,72 +10004,91 @@@ msgstr "
"@\n"
"(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "Használat: gpg [opciók] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s és %s nem használható együtt!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Páncélozás nem sikerült: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Páncélozás nem sikerült: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "A sor túl hosszú!\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "Olvasási hiba: %s.\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "nem feldolgozott"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10279,7 -8179,14 +10268,18 @@@ msgstr "\"%s\" nem JPEG állomány.\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
@@@ -10344,12 -8239,10 +10344,12 @@@ msgstr "Keresem \"%s\"-t a %s HKP szerv
msgid "malloc failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10413,12 -8294,6 +10413,7 @@@ msgstr "Hiba a \"%s\" kulcskarika írá
msgid "error reading HTTP response for '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "Hiba \"%s\" olvasásakor: %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@@ -10537,77 -8388,61 +10532,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Aláírás sikertelen: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Aláírás sikertelen: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10744,193 -8550,146 +10739,193 @@@ msgstr "Aláírás sikertelen: %s\n
msgid "error sending standard options: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|N. sorszámú jelszómód használata"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NÉV|titkosítás NÉV részére"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "hálózati hiba"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "rossz jelszó"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "nyilvános kulcs nem található"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -11003,27 -8746,22 +10998,27 @@@ msgstr "kimeneti állomány megadása
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "nyilvános kulcs nem található"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
diff --cc po/id.po
index d3cf21a,cf0f261..268cacd
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -20,7 -19,6 +20,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
@@@ -31,40 -29,31 +31,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "passphrase tidak valid
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -82,75 -70,59 +82,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase yang buruk"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "baris terlalu panjang\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "passphrase terlalu panjang\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Karakter tidak valid dalam nama\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "MPI yang buruk"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "passphrase yang buruk"
@@@ -160,152 -131,111 +160,152 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "ubah passphrase"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ulangi passphrase: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Ulangi passphrase: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ulangi passphrase: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -384,8 -301,6 +384,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "ubah passphrase"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -395,124 -310,95 +395,128 @@@ msgstr "
"Pilihan:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Kunci dilampaui"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detil"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "lebih diam"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "cari kunci di keyserver"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "perbarui database trust"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAMA|set charset terminal ke NAMA"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "tidak didukung"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -521,179 -407,136 +525,184 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "algoritma digest yang dipilih tidak valid\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -544,6 +710,9 @@@ msgstr "
"@Perintah:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -757,8 -589,6 +766,8 @@@ msgstr "Batal
msgid "error while asking for the passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -817,8 -638,6 +826,8 @@@ msgstr "
msgid "Yes"
msgstr "y|ya"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -869,19 -681,16 +878,19 @@@ msgstr "ubah passphrase
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "aktifkan kunci"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -901,7 -707,6 +910,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
@@@ -942,8 -737,6 +951,8 @@@ msgstr "kesalahan penciptaan passphrase
msgid "error creating a stream for a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -1071,7 -838,6 +1080,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -1086,7 -850,6 +1095,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1201,8 -941,6 +1210,8 @@@ msgstr "%s: keyring tercipta\n
msgid "algorithm: %s"
msgstr "armor: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1394,7 -1094,6 +1403,7 @@@ msgstr "opsi impor tidak valid\n
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "opsi impor tidak valid\n"
@@@ -1419,7 -1114,6 +1428,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "tidak diproses"
@@@ -1478,8 -1161,6 +1487,8 @@@ msgstr "kunci publik %08lX tidak ditemu
msgid "waiting for lock %s...\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1612,7 -1267,6 +1621,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1621,35 -1274,33 +1630,42 @@@
msgid "Enter passphrase: "
msgstr "Masukkan passphrase: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s belum dapat dipakai dengan %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "kunci rahasia tidak tersedia"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@@ -1659,15 -1309,10 +1675,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "bagian kunci rahasia tidak tersedia\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Pilihan anda? "
@@@ -1729,154 -1361,107 +1745,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "tidak ada kunci publik yang sesuai: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "perbarui preferensi"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "tampilkan fingerprint"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1884,179 -1469,135 +1885,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Pilihan tidak valid.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Ditandai? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "berhenti dari menu ini"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "tampilkan bantuan"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Kunci tersedia di:"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "ubah tanggal kadaluarsa"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "ubah ownertrust"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "buat sepasang kunci baru"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "gagal membaca keyblock: %s\n"
@@@ -2118,83 -1647,78 +2119,96 @@@ msgstr "terdapat kunci rahasia untuk ku
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "menggunakan cipher %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "PERINGATAN: `%s' adalah file kosong\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "Membaca dari `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr ""
+ "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s dienkripsi untuk: %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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s data terenkripsi\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "masalah menangani paket terenkripsi\n"
@@@ -2284,40 -1791,31 +2298,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: dilewati: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "menulis ke `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2387,234 -1872,186 +2401,239 @@@ msgstr "|NAMA|gunakan NAMA sebagai kunc
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opsi impor tidak valid\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "buat detached signature"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|buat signature teks"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "buat detached signature"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "enkripsi data"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verifikasi signature"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "tampilkan kunci"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "periksa signature kunci"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "ekspor kunci"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "ekspor kunci ke keyserver"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "impor kunci dari keyserver"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "cari kunci di keyserver"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "impor/gabung kunci"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "perbarui database trust"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [file]|cetak digest pesan"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "jangan buat perubahan"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2622,7 -2059,6 +2641,7 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2652,13 -2088,11 +2671,13 @@@ msgstr "
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2673,7 -2107,6 +2692,7 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2681,550 -2114,418 +2700,531 @@@ msgstr "
"\n"
"Algoritma yang didukung:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Kompresi: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pemakaian: gpg [pilihan] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Bukan alamat email yang valid\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@@ -3238,7 -2537,6 +3238,7 @@@ msgstr "mengambil kunci ini dari keyrin
msgid "make timestamp conflicts only a warning"
msgstr "buat timestamp konflik hanya sebagai peringatan"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
@@@ -3269,332 -2562,269 +3269,337 @@@ msgstr "Tidak tersedia bantuan
msgid "No help available for '%s'"
msgstr "Tidak tersedia bantuan untuk `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "perbarui database trust"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "perbarui database trust"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "tampilkan fingerprint"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "kunci rahasia tidak dapat dipakai"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "tampilkan fingerprint"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "melewati blok tipe %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kunci telah diproses\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Jumlah yang telah diproses: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " tanpa ID user: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " diimpor: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " tidak berubah: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID user baru: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subkey baru: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " pembatalan kunci baru: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " kunci rahasia diimpor: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " kunci rahasia tidak berubah: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " tidak diimpor: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "kunci %08lX: tidak ada ID user yang valid\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "kunci %08lX: kunci baru - dilewati\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kunci %08lX: \"%s\" tidak berubah\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "kunci %08lX: kunci rahasia diimpor\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
@@@ -3609,141 -2839,114 +3614,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
"pembatalan\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kunci %08lX: subkey binding tidak valid\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kunci %08lX: hapus subkey binding ganda\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kunci %08lX: melewati ID user "
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "kunci %08lX: melewati subkey\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@@ -3785,79 -2981,12 +3790,15 @@@ msgstr "kesalahan membaca `%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[pembatalan]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[self-signature]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s signature, algoritma digest %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Signature baik dari \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "melewati `%s': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "User ID \"%s\" dibatalkan."
- msgstr[1] "User ID \"%s\" dibatalkan."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
- msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d signature yang buruk\n"
- msgstr[1] "%d signature yang buruk\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Signature baik dari \""
- msgstr[1] "Signature baik dari \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3870,68 -2999,53 +3811,68 @@@ msgstr "
"memeriksa fingerprint dari berbagai sumber...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Saya cukup percaya\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Saya sangat percaya\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Apakah anda yakin masih ingin menandainya? (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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr "..Tidak dapat menandai.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID \"%s\" kadaluwarsa."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3940,11 -3054,9 +3881,11 @@@ msgstr "
"Self-signature pada \"%s\"\n"
"adalah signature bergaya PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3953,13 -3065,11 +3894,13 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"telah habis berlaku.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
"berlaku? (y/N)"
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3968,43 -3078,34 +3909,43 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"adalah signature.lokal \n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Apakah anda ingin menandainya lagi? (y/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Kunci ini telah berakhir!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4014,32 -3115,26 +3955,32 @@@ msgstr "
"menandai benar benar milik\n"
"orang tersebut? Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Saya tidak akan menjawab.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Saya belum memeriksanya.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Saya telah melakukan pemeriksaan biasa.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4048,265 -3143,211 +3989,265 @@@ msgstr "
"Apakah anda yakin untuk menandai kunci ini \n"
"dengan kunci anda: "
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ini akan jadi self-signature.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat diekspor.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Saya belum memeriksa kunci ini sama sekali.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Saya telah memeriksa kunci ini.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "simpan dan berhenti"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Notasi signature: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "tampilkan kunci dan ID user"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "batalkan signature"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "tandai kunci secara lokal"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "tambah sebuah ID user"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "tambah sebuah photo ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "hapus ID user"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "hapus kunci sekunder"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "tambah kunci pembatalan"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "tandai ID user sebagai primer"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "tampilkan preferensi (ahli)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "tampilkan preferensi (verbose)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "ubah passphrase"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "ubah ownertrust"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "batalkan sebuah ID user"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "batalkan kunci sekunder"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "aktifkan kunci"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "tiadakan kunci"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "tampilkan photo ID"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Kunci rahasia tersedia.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4314,294 -3355,240 +4255,304 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Kunci dibatalkan"
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Tandai ID seluruh user? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Tandai ID seluruh user? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "kelas signature tidak dikenal"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Hapus ID user ini? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Hapus ID user ini? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Anda ingin menghapus kunci ini? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Benar-benar hapus ID user ini? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Anda ingin membatalkan kunci terpilih ini? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "set daftar preferensi"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Update preferensi?"
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Simpan perubahan? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Berhenti tanpa menyimpan? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "nilai yang tidak valid\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "kesalahan: fingerprint tidak valid\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "kunci '%s' tidak ditemukan: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Fitur: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notasi: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (sensitive)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revoked] "
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Kunci ini telah ditiadakan"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4609,20 -3596,14 +4560,20 @@@ 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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4630,17 -3611,14 +4581,17 @@@ msgstr "
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4650,35 -3628,27 +4601,35 @@@ msgstr "
"dapat menyebabkan beberapa versi\n"
" PGP menolak kunci ini.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Anda tetap ingin menambahkannya? (y/n) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Hapus signature baik ini? (y/T/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Hapus signature tidak valid ini? (y/T/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4686,38 -3656,31 +4637,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Menghapus %d signature.\n"
msgstr[1] "Menghapus %d signature.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Tidak ada yang dihapus.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "armor tidak valid"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "User ID \"%s\" dibatalkan."
msgstr[1] "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4727,44 -3690,36 +4678,44 @@@ msgstr "
"designated dapat\n"
"............menyebabkan beberapa versi PGP menolak kunci ini.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
"sendiri\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
"dilakukan\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4772,178 -3727,145 +4723,183 @@@
msgstr ""
"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "melewati self-signature v3 pada user id \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Notasi signature: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ditimpa (y/T)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID user: "
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " ditandai oleh %08lX pada %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Anda tetap ingin membatalkannya? (y/n) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " ditandai oleh %08lX pada %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Anda telah menandai ID user ini:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opsi impor tidak valid\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "preferensi %c%lu ganda \n"
@@@ -5387,8 -4232,6 +5343,8 @@@ msgstr "
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
@@@ -5462,7 -4292,6 +5418,7 @@@ msgstr "kesalahan menulis keyring publi
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5472,65 -4301,52 +5428,65 @@@ msgstr "
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "tidak pernah..."
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kebijakan signature kritis: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Kebijakan signature: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Notasi signature kritis: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Notasi signature: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5538,7 -4354,20 +5494,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d signature yang buruk\n"
msgstr[1] "%d signature yang buruk\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d signature yang buruk\n"
+ msgstr[1] "%d signature yang buruk\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
+ msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5546,41 -4375,33 +5518,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signature tidak diperiksa karena kesalahan\n"
msgstr[1] "1 signature tidak diperiksa karena kesalahan\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Keyring"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Fingerprint kunci primer:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Fingerprint kunci primer ="
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kunci ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5690,264 -4490,216 +5662,271 @@@ msgstr "kunci '%s' tidak ditemukan: %s\
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"ditandai dengan kunci anda %08lX pada %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s kunci sesi enkripsi\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "kunci publik adalah %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "gagal dekripsi kunci publik: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "dienkripsi dengan passphrase %lu\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "dienkripsi dengan 1 passphrase\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "asumsikan %s data terenkripsi\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "dekripsi lancar\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "original file name='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "signature BURUK dari \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature kadaluarsa dari \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "verifikasi signature tidak diabaikan\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "tidak dapat menangani banyak signature ini\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Kunci tersedia di:"
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[uncertain]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature kadaluarsa pada %s \n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "biner"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "modeteks"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "tidak dikenal"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritma pubkey tidak dikenal"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Tidak dapat memeriksa signature: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "bukan detached signature\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "kelas signature mandiri 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "signature model lama (PGP 2.X)\n"
@@@ -6006,67 -4747,54 +5985,67 @@@ msgstr "kesalahan pembacaan: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "silakan gunakan \"%s%s\"\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Tidak dikompresi"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "Tidak dikompresi"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "membaca pilihan dari `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "kelas signature tidak dikenal"
@@@ -6579,35 -5208,32 +6558,40 @@@ msgstr "tidak dapat membuka data tertan
msgid "can't open signed data fd=%d: %s\n"
msgstr "tidak dapat membuka data tertandai `%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "kunci %08lX: tidak ada ID user\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "baik, kita adalah penerima anonim.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "encoding lama DEK tidak didukung\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6771,7 -5369,6 +6755,7 @@@ msgstr "(Tidak diberikan deskripsi)\n
msgid "Is this okay? (y/N) "
msgstr "Ini oke? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "kunci lemah tercipta - mengulang\n"
@@@ -6791,42 -5385,40 +6775,48 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "Peringatan: konflik digest signature dalam pesan\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
++#: g10/sig-check.c:191
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = beri saya informasi lebih banyak lagi\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
"tidak valid\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6837,7 -5429,6 +6827,7 @@@ msgstr[0] "
msgstr[1] ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6847,41 -5438,34 +6837,41 @@@ msgstr[0] "
msgstr[1] ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "CATATAN: kunci telah dibatalkan"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
"dikenal\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar). "
"Menggunakan yang tidak di-expand.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6889,7 -5473,6 +6879,7 @@@ msgstr "
"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
"Menggunakan yang tidak expand.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6898,42 -5481,34 +6888,42 @@@ msgstr "
"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
"Menggunakan yang tidak expand.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signature dari: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "menandai:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s enkripsi akan digunakan\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "lewati `%s': terduplikasi\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7022,7 -5581,6 +7012,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
@@@ -7134,149 -5670,120 +7124,149 @@@ msgstr "tidak dapat menangani baris tek
msgid "input line longer than %d characters\n"
msgstr "baris input lebih dari %d karakter\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritma yang didukung:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: kesalahan menulis dir record: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "tampilkan kunci dan ID user"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Kebijakan: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "tampilkan kunci"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7284,68 -5791,58 +7274,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "dienkripsi dengan passphrase %lu\n"
msgstr[1] "dienkripsi dengan passphrase %lu\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [file]|cetak digest pesan"
@@@ -7353,149 -5850,123 +7343,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Menghapus %d signature.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "dienkripsi dengan passphrase %lu\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Kebijakan: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7512,18 -5983,14 +7502,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7759,19 -6181,14 +7749,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7820,44 -6228,35 +7810,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "hapus kunci dari keyring publik"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
@@@ -7865,54 -6264,43 +7855,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "ubah passphrase"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7922,26 -6310,21 +7912,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "ubah passphrase"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "ubah passphrase"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7949,117 -6332,93 +7939,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "ubah passphrase"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "ubah passphrase"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "gagal membaca keyblock: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' sudah dikompresi\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "buat sepasang kunci baru"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "buat sepasang kunci baru"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI tidak didukung"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Pembuatan kunci gagal: %s\n"
msgstr[1] "Pembuatan kunci gagal: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@@ -8080,11 -6436,9 +8070,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
@@@ -8140,12 -6483,10 +8130,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8220,9 -6546,6 +8210,9 @@@ msgstr "kesalahan penciptaan passphrase
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
@@@ -8409,7 -6692,6 +8399,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8453,7 -6728,6 +8443,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@@ -8718,11 -6939,9 +8708,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8751,139 -6965,108 +8741,139 @@@ msgstr "preferensi %c%lu ganda \n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Tidak diberikan deskripsi)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "tampilkan kunci rahasia"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "sertifikat yang buruk"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "sertifikat yang buruk"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "sertifikat yang buruk"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ciptakan output ascii"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "jangan menggunakan terminal"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "mode batch: tanpa tanya"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "asumsikan ya untuk seluruh pertanyaan"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "asumsikan tidak untuk seluruh pertanyaan"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "tambah keyring ini ke daftar keyring"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMA|gunakan algoritma cipher NAMA"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8894,47 -7077,38 +8884,47 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Tidak diberikan deskripsi)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = lewati kunci ini\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "menulis ke `%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8997,7 -7159,6 +8987,7 @@@ msgstr "rev? masalah memeriksa pembatal
msgid "error storing flags: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9026,7 -7183,6 +9016,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9040,51 -7195,41 +9030,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Signature kadaluwarsa %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Signature baik dari \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " alias \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9885,116 -7869,88 +9875,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Berhenti tanpa menyimpan? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10007,91 -7963,72 +9997,91 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pemakaian: gpg [pilihan] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "baris terlalu panjang\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kesalahan pembacaan: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "tidak diproses"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10271,7 -8172,14 +10261,18 @@@ msgstr "\"%s\" bukan sebuah file JPEG\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "kesalahan membaca `%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -10336,12 -8232,10 +10337,12 @@@ msgstr "mencari \"%s\" dari server HKP
msgid "malloc failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10405,12 -8287,6 +10406,7 @@@ msgstr "kesalahan menulis keyring `%s'
msgid "error reading HTTP response for '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "kesalahan membaca `%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -10529,77 -8381,61 +10525,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10736,193 -8543,146 +10732,193 @@@ msgstr "gagal menandai: %s\n
msgid "error sending standard options: %s\n"
msgstr "kesalahan mengirim ke `%s': %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|gunakan passphrase mode N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "kesalahan jaringan"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "passphrase yang buruk"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "kunci publik tidak ditemukan"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -10995,27 -8739,22 +10991,27 @@@ msgstr "gunakan sebagai file output
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "kunci publik tidak ditemukan"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "menulis kunci rahasia ke `%s'\n"
diff --cc po/it.po
index dd853fe,b2aaec2..833057b
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -15,7 -14,6 +15,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
@@@ -26,40 -24,31 +26,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "passphrase non valida
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -77,75 -65,59 +77,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Inserisci la passphrase, cioè una frase segreta \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase errata"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "riga troppo lunga\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "passphrase troppo lunga\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Carattere non valido nel nome\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "MPI danneggiato"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "passphrase errata"
@@@ -155,152 -126,111 +155,152 @@@
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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia la passphrase"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ripeti la passphrase: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Ripeti la passphrase: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ripeti la passphrase: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -379,8 -296,6 +379,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia la passphrase"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -390,124 -305,95 +390,128 @@@ msgstr "
"Opzioni:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Questa chiave è stata sostituita"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "prolisso"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "meno prolisso"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca delle chiavi su un keyserver"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aggiorna il database della fiducia"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOME|imposta NOME come set di caratteri del terminale"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non gestito"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,179 -402,136 +520,184 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "l'algoritmo di digest selezionato non è valido\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non è disponibile in questa sessione\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -539,6 +705,9 @@@ msgstr "
"@Comandi:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -752,8 -584,6 +761,8 @@@ msgstr "Cancella
msgid "error while asking for the passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -812,8 -633,6 +821,8 @@@ msgstr "
msgid "Yes"
msgstr "si|sì"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -864,19 -676,16 +873,19 @@@ msgstr "cambia la passphrase
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "abilita una chiave"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -896,7 -702,6 +905,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
@@@ -937,8 -732,6 +946,8 @@@ msgstr "errore nella creazione della pa
msgid "error creating a stream for a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -1066,7 -833,6 +1075,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
@@@ -1081,7 -845,6 +1090,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1196,8 -936,6 +1205,8 @@@ msgstr "%s: portachiavi creato\n
msgid "algorithm: %s"
msgstr "armatura: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1390,7 -1090,6 +1399,7 @@@ msgstr "opzioni di importazione non val
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "opzioni di importazione non valide\n"
@@@ -1416,7 -1111,6 +1425,7 @@@ msgid "command \"%.50s\" is ambiguous\n
msgstr ""
# ??? (Md)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "non esaminato"
@@@ -1475,8 -1158,6 +1484,8 @@@ msgstr "chiave pubblica %08lX non trova
msgid "waiting for lock %s...\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1609,7 -1264,6 +1618,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1618,35 -1271,33 +1627,42 @@@
msgid "Enter passphrase: "
msgstr "Inserisci la passphrase: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s non funziona ancora con %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la chiave segreta non è disponibile"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
@@@ -1656,15 -1306,10 +1672,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Questo comando non è permesso in modalità %s.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "parti della chiave segreta non sono disponibili\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Cosa scegli? "
@@@ -1727,154 -1359,107 +1743,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "non c'è una chiave pubblica corrispondente: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "preferenze aggiornate"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "mostra le impronte digitali"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "saltata: chiave pubblica già presente\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1882,179 -1467,135 +1883,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Firma scaduta il %s\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Scelta non valida.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Per favore scegli il motivo della revoca:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Questo comando non è permesso in modalità %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "saltata: chiave pubblica già presente\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Firmo davvero? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "abbandona questo menù"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "mostra questo aiuto"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Chiave disponibile presso: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "cambia la data di scadenza"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "cambia il valore di fiducia"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "genera una nuova coppia di chiavi"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
@@@ -2116,40 -1645,33 +2117,40 @@@ msgstr "c'è una chiave segreta per la
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"impossibile usare un pacchetto ESK simmetrico a causa della modalità S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "uso il cifrario %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' è già compresso\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ATTENZIONE: `%s' è un file vuoto\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lettura da `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2157,7 -1679,14 +2158,18 @@@ msgstr "
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "non è possibile usare l'algoritmo di cifratura \"%s\" in modalità %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2166,41 -1695,35 +2178,42 @@@ msgstr "
"forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrato per: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "non è possibile usare %s in modalità %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "dati cifrati con %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
"per il cifrario simmetrico\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problema nella gestione del pacchetto cifrato\n"
@@@ -2291,40 -1797,31 +2304,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: saltata: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "scrittura in `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non è stato esportato nulla\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2394,234 -1878,186 +2407,239 @@@ msgstr "|NOME|usa NOME come chiave segr
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opzioni di importazione non valide\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "cifra dati"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "elenca le chiavi"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "esporta delle chiavi"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "esporta le chiavi a un keyserver"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importa le chiavi da un keyserver"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "cerca delle chiavi su un keyserver"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un keyserver"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifra per NOME"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "non fa cambiamenti"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2629,7 -2065,6 +2647,7 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2659,13 -2094,11 +2677,13 @@@ msgstr "
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2680,7 -2113,6 +2698,7 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2688,549 -2120,418 +2706,531 @@@ msgstr "
"\n"
"Algoritmi gestiti:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "A chiave pubblica: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Cifrari: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Compressione: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opzioni] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL della politica di firma indicato non è valido\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "L'indirizzo di email non è valido\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non è valido\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non è permesso usare %s con %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non è valido\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non è valido\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non è valido\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "non è possibile usare l'algoritmo di digest \"%s\" in modalità %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr ""
"non è possibile usare l'algoritmo di compressione \"%s\" in modalità %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "non è possibile usare %s in modalità %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "non è possibile usare %s in modalità %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non è valido\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non è valido\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non è valido\n"
@@@ -3244,7 -2543,6 +3244,7 @@@ msgstr "prende le chiavi da questo port
msgid "make timestamp conflicts only a warning"
msgstr "segnala i conflitti di data solo con un avvertimento"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato sul FD"
@@@ -3275,332 -2568,269 +3275,337 @@@ msgstr "Non è disponibile un aiuto
msgid "No help available for '%s'"
msgstr "Non è disponibile un aiuto per `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "mostra le impronte digitali"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chiave segreta inutilizzabile"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "mostra le impronte digitali"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "salto un blocco di tipo %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Numero totale esaminato: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " senza user ID: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modificate: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuovi user ID: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuove subchiavi: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nuove revoche di chiavi: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chiavi segrete importate: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importate: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chiave %08lX: nessun user ID valido\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "questo può essere causato da una autofirma mancante\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chiave %08lX: nuova chiave - saltata\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chiave %08lX: \"%s\" una nuova firma\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chiave %08lX: \"%s\" non cambiata\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "saltata: chiave pubblica già presente\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
@@@ -3615,144 -2845,117 +3620,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
"certificato di revoca\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chiave %08lX: nessun user ID per la firma\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chiave %08lX: revoca della subchiave non valida\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chiave %08lX: saltato l'user ID '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"ATTENZIONE: la chiave %08lX può essere stata revocata: scarico la chiave\n"
"di revoca %08lX.\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ATTENZIONE: la chiave %08lX può essere stata revocata: la chiave di\n"
"revoca %08lX non è presente.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
@@@ -3794,79 -2990,12 +3799,15 @@@ msgstr "errore leggendo `%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "rebuild della cache del portachiavi fallito: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revoca]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autofirma]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "Firma %s, algoritmo di digest %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Firma valida da \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "saltata `%s': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "L'user ID \"%s\" è stato revocato."
- msgstr[1] "L'user ID \"%s\" è stato revocato."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "una firma non controllata per mancanza della chiave\n"
- msgstr[1] "una firma non controllata per mancanza della chiave\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d firme non corrette\n"
- msgstr[1] "%d firme non corrette\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Firma valida da \""
- msgstr[1] "Firma valida da \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3879,68 -3008,53 +3820,68 @@@ msgstr "
"impronte digitali da diverse fonti...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fido marginalmente\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi fido completamente\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'user ID \"%s\" è stato revocato."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare? (s/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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Impossibile firmarla.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'user ID \"%s\" è scaduto."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'user ID \"%s\" non è autofirmato."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'user ID \"%s\" non è autofirmato."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3949,11 -3063,9 +3890,11 @@@ msgstr "
"L'autofirma su \"%s\"\n"
"è una firma in stile PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3962,11 -3074,9 +3903,11 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"è scaduta\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3975,43 -3085,34 +3916,43 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"è una firma locale.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" era già stato firmato localmente dalla chiave %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" era già stato firmato dalla chiave %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Questa chiave è scaduta!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Questa chiave scadrà il %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4021,32 -3122,26 +3962,32 @@@ msgstr "
"appartiene veramente alla persona indicata sopra?\n"
"Se non sai cosa rispondere digita \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Preferisco non rispondere.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non l'ho controllata per niente.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) L'ho controllata superficialmente.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) L'ho controllata molto attentamente.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4055,265 -3150,211 +3996,265 @@@ msgstr "
"Sei davvero sicuro di volere firmare questa chiave\n"
"con la tua chiave: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Questa sarà una autofirma.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"ATTENZIONE: la firma non sarà marcata come non esportabile.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"ATTENZIONE: la firma sarà marcata come irrevocabile.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La firma sarà marcata come non esportabile.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La firma sarà marcata come irrevocabile.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non ho controllato per niente questa chiave.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ho controllato questa chiave superficialmente.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Ho controllato questa chiave molto attentamente.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "salva ed esci"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "elenca le chiavi e gli user ID"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "revoca firme"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "firma la chiave localmente"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "aggiungi un user ID"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "aggiungi un ID fotografico"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "cancella un user ID"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "cancella una chiave secondaria"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "aggiungi una chiave di revoca"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "imposta l'user ID come primario"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "elenca le preferenze (per esperti)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "elenca le preferenze (prolisso)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "cambia la passphrase"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un user ID"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una chiave secondaria"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "abilita una chiave"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "disabilita una chiave"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra l'ID fotografico"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "È disponibile una chiave segreta.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4321,294 -3362,240 +4262,304 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "La chiave è stata revocata."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Firmo davvero tutti gli user ID? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Firmo davvero tutti gli user ID? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe della firma sconosciuta"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Questo comando non è permesso in modalità %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Tolgo davvero questo user ID? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Tolgo davvero questo user ID? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vuoi davvero cancellare questa chiave? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Revoco davvero questo user ID? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "imposta la lista di preferenze"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Aggiorno davvero le preferenze? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvo i cambiamenti? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Esco senza salvare? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valore non valido\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "User ID inesistente.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "errore: impronta digitale non valida\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "chiave `%s' non trovata: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Caratteristiche: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Nota: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Questa chiave può essere revocata dalla chiave %s "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Questa chiave può essere revocata dalla chiave %s "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (sensibile)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossibile creare %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocata]"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Questa chiave è stata disabilitata"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4617,20 -3604,14 +4568,20 @@@ 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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4639,17 -3620,14 +4590,17 @@@ msgstr "
" potrebbe fare diventare un altro user ID il primario "
"predefinito.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4658,36 -3636,28 +4609,36 @@@ msgstr "
"ATTENZIONE: Questa è una chiave in stile PGP2. Aggiungere un ID fotografico\n"
" può causarne il rifiuto da parte di alcune versioni di PGP.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Cancellare questa firma corretta? (s/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Cancellare questa firma non valida? (s/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Cancellare davvero questa autofirma? (s/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4695,38 -3665,31 +4646,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Cancellata %d firma.\n"
msgstr[1] "Cancellata %d firma.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Non è stato cancellato nulla.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "armatura non valida"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'user ID \"%s\" è stato revocato."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "L'user ID \"%s\" è stato revocato."
msgstr[1] "L'user ID \"%s\" è stato revocato."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'user ID \"%s\" è già stato revocato\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'user ID \"%s\" è già stato revocato\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4736,46 -3699,38 +4687,46 @@@ msgstr "
" designato può causarne il rifiuto da parte di alcune versioni\n"
" di PGP.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Non è possibile aggiungere un revocatore designato a una chiave in stile\n"
"PGP 2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Inserisci l'user ID del revocatore designato: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"impossibile nominare una chiave come revocatore designato di sè stessa\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n"
"annullata.\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4783,182 -3738,149 +4734,187 @@@
msgstr ""
"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
"incrociata\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Devi selezionare esattamente un user ID.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Sovrascrivo (s/N)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " firmata da %08lX il %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Questa chiave è scaduta il %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Creare un certificato di revoca per questa firma? (s/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " firmata da %08lX il %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocata da %08lX il %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Creare davvero i certificati di revoca? (s/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'user ID \"%s\" è già stato revocato\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'user ID \"%s\" è già stato revocato\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'user ID \"%s\" è già stato revocato\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opzioni di importazione non valide\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "la preferenza %c%lu è doppia\n"
@@@ -5404,8 -4249,6 +5360,8 @@@ msgstr "
"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
"numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
@@@ -5477,7 -4307,6 +5433,7 @@@ msgstr "errore scrivendo il portachiav
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5487,7 -4316,6 +5443,7 @@@ msgstr "
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5495,7 -4323,6 +5451,7 @@@ msgstr "
"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5503,51 -4330,40 +5459,51 @@@ msgstr "
"la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "mai "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politica critica di firma: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politica di firma: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Annotazione critica della firma: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Annotazione della firma: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5555,7 -4371,20 +5511,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d firme non corrette\n"
msgstr[1] "%d firme non corrette\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d firme non corrette\n"
+ msgstr[1] "%d firme non corrette\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "una firma non controllata per mancanza della chiave\n"
+ msgstr[1] "una firma non controllata per mancanza della chiave\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5563,41 -4392,33 +5535,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "una firma non controllata a causa di un errore\n"
msgstr[1] "una firma non controllata a causa di un errore\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Portachiavi"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impronta digitale ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5707,27 -4507,22 +5679,27 @@@ msgstr "chiave `%s' non trovata: %s\n
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
@@@ -5735,236 -4530,192 +5707,242 @@@
"firmata con la tua chiave %08lX il %s\n"
"\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "chiave di sessione cifrata con %s\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "la chiave pubblica è %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "Cifrato con la chiave %s con ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifratura della chiave pubblica fallita: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifratto con %lu passphrase\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "cifratto con 1 passphrase\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "suppongo che i dati siano cifrati con %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "ATTENZIONE: l'integrità del messaggio non era protetta\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "decifratura corretta\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome del file originale='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Firma valida da \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma NON corretta da \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma scaduta da \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Firma valida da \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "impossibile gestire queste firme multiple\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Chiave disponibile presso: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[incerta]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "ATTENZIONE: questa chiave non è certificata con una firma fidata!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Questa firma scadrà il %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "modo testo"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "sconosciuto"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo della chiave pubblica sconosciuto"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "non è una firma separata\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "ATTENZIONE: trovate firme multiple. Sarà controllata solo la prima.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma solitaria di classe 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
@@@ -6025,67 -4765,54 +6003,67 @@@ msgstr "errore di lettura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d \"%s\" è una opzione deprecata\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "usa al suo posto \"%s%s\"\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Non compresso"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "Non compresso"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "classe della firma sconosciuta"
@@@ -6604,36 -5232,33 +6582,41 @@@ msgstr "impossibile aprire i dati firma
msgid "can't open signed data fd=%d: %s\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "chiave %08lX: nessun user ID\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "bene, siamo il destinatario anonimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "la vecchia codifica del DEK non è gestita\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "l'algoritmo di cifratura %d%s è sconosciuto o disattivato\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"NOTA: l'algoritmo di cifratura %d non è stato trovato tra le preferenze\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6796,7 -5393,6 +6779,7 @@@ msgstr "(Non è stata data una descrizi
msgid "Is this okay? (y/N) "
msgstr "Va bene così? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "creata una chiave debole - riprovo\n"
@@@ -6817,44 -5410,42 +6800,50 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "non è possibile usare %s in modalità %s\n"
+
++#: g10/sig-check.c:191
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
"incrociata\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrami ulteriori informazioni\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
"non valida\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
msgstr[1] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
msgstr[1] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6867,7 -5458,6 +6856,7 @@@ msgstr[1] "
"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6879,45 -5469,38 +6868,45 @@@ msgstr[1] "
"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: la chiave è stata revocata"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"si suppone una firma non valida della chiave %08lX a causa di un\n"
"bit critico sconosciuto\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"chiave %08lX: non c'è una subchiave per il pacchetto di revoca della "
"subchiave\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"chiave %08lX: non c'è una subchiave per la firma di collegamento della "
"subchiave\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
"inespansa.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6926,7 -5509,6 +6915,7 @@@ msgstr "
"lunga).\n"
"Usata inespansa.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6936,43 -5518,35 +6925,43 @@@ msgstr "
"lunga).\n"
"Usata inespansa.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Firma %s da: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "firma:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "sarà usato il cifrario %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "saltata `%s': doppia\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "saltata: chiave pubblica già presente\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7061,7 -5619,6 +7050,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
@@@ -7173,149 -5708,120 +7162,149 @@@ msgstr "impossibile gestire linee di te
msgid "input line longer than %d characters\n"
msgstr "linea di input più lunga di %d caratteri\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmi gestiti:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: errore durante la scrittura del dir record: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Policy: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "elenca le chiavi"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7323,68 -5829,58 +7312,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "cifratto con %lu passphrase\n"
msgstr[1] "cifratto con %lu passphrase\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [files]|stampa tutti i message digests"
@@@ -7392,149 -5888,123 +7381,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Cancellate %d firme.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "cifratto con %lu passphrase\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Policy: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7551,18 -6021,14 +7540,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7799,19 -6220,14 +7788,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7860,44 -6267,35 +7849,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "rebuild della cache del portachiavi fallito: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "rimuove le chiavi dal portachiavi pubblico"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
@@@ -7905,54 -6303,43 +7894,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "cambia la passphrase"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7962,26 -6349,21 +7951,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "cambia la passphrase"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "cambia la passphrase"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Per favore scegli il motivo della revoca:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7989,117 -6371,93 +7978,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "cambia la passphrase"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "cambia la passphrase"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "errore leggendo il keyblock: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' è già compresso\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "genera una nuova coppia di chiavi"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "genera una nuova coppia di chiavi"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI non gestito"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Generazione della chiave fallita: %s\n"
msgstr[1] "Generazione della chiave fallita: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@@ -8120,11 -6475,9 +8109,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
@@@ -8180,12 -6522,10 +8169,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8260,9 -6585,6 +8249,9 @@@ msgstr "errore nella creazione della pa
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
@@@ -8449,7 -6731,6 +8438,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8493,7 -6767,6 +8482,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@@ -8757,11 -6977,9 +8746,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8790,139 -7003,108 +8779,139 @@@ msgstr "la preferenza %c%lu è doppia\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Non è stata data una descrizione)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "elenca le chiavi segrete"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "certificato danneggiato"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "certificato danneggiato"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "certificato danneggiato"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea un output ascii con armatura"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "non usa per niente il terminale"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "modo batch: non fa domande"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "risponde \"sì\" a quasi tutte le domande"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "risponde \"no\" a quasi tutte le domande"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa l'algoritmo di cifratura NOME"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa l'algoritmo di message digest NOME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8933,47 -7115,38 +8922,47 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Non è stata data una descrizione)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = salta questa chiave\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "scrittura in `%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9036,7 -7197,6 +9025,7 @@@ msgstr "rev? problema controllando la r
msgid "error storing flags: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9065,7 -7221,6 +9054,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9079,51 -7233,41 +9068,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "l'algoritmo di protezione %d%s non è gestito\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Firma scaduta il %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Firma valida da \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " alias \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9926,116 -7909,88 +9915,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Esco senza salvare? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10048,92 -8003,73 +10037,92 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opzioni] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "Non è permesso usare %s con %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riga troppo lunga\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "errore: impronta digitale non valida\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "errore di lettura: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
# ??? (Md)
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "non esaminato"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10313,7 -8213,14 +10302,18 @@@ msgstr "\"%s\": non è un file JPEG\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "errore leggendo `%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@@ -10378,12 -8273,10 +10378,12 @@@ msgstr "cerco \"%s\" sul server HKP %s\
msgid "malloc failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10447,12 -8328,6 +10447,7 @@@ msgstr "errore scrivendo il portachiav
msgid "error reading HTTP response for '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "errore leggendo `%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -10571,77 -8422,61 +10566,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "rebuild della cache del portachiavi fallito: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10778,193 -8584,146 +10773,193 @@@ msgstr "firma fallita: %s\n
msgid "error sending standard options: %s\n"
msgstr "errore leggendo `%s': %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usa il modo N per la passphrase"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "errore nella creazione della passhprase: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifra per NOME"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "errore di rete"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "passphrase errata"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "chiave pubblica non trovata"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "errore leggendo `%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -11037,27 -8780,22 +11032,27 @@@ msgstr "usa come file di output
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "chiave pubblica non trovata"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "scrittura della chiave segreta in `%s'\n"
diff --cc po/ja.po
index ea49b6c,32bc34d..cb38b7e
--- a/po/ja.po
+++ b/po/ja.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.1.20\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -20,7 -19,6 +20,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "pinentryのロックの獲得に失敗しました: %s\n"
@@@ -31,45 -29,35 +31,45 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|キャンセル(_C)"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr "|pinentry-label|_Yes"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr "|pinentry-label|_No"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr "|pinentry-label|パスワードマネージャに保管(_S)"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "本当に画面にパスフレーズを見えるようにしますか?"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr "|pinentry-tt|パスフレーズを見えるようにする"
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
msgid "|pinentry-tt|Hide passphrase"
msgstr "|pinentry-tt|パスフレーズを隠す"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "品質:"
@@@ -79,11 -67,9 +79,11 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr "pinentry.qualitybar.tooltip"
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -91,7 -77,6 +91,7 @@@ msgstr "
"あなたのPINを入力してください(このセッションで秘密鍵のロックを解除するために"
"使われます)"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -99,53 -84,40 +99,53 @@@ msgstr "
"あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
"るために使われます)"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "パスフレーズ:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "一致しません - もう一度"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (現在 %d / 最大 %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "繰り返し:"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "PINが長すぎます"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "パスフレーズが長すぎます"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "PINに無効な文字があります"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "PINが短すぎます"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "不正なPINです"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "パスフレーズが不正です"
@@@ -154,56 -125,34 +154,56 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s'が作成できません: %s\n"
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "カードを検出しました。シリアル番号: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "カードにsshの認証鍵がありません: %s\n"
- #: agent/command-ssh.c:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "適当なカードの鍵が見つかりません: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, c-format
msgid "error getting list of cards: %s\n"
msgstr "カードのリスト の取得エラー: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "許可する"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "拒否する"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "このパスフレーズをもう一度入力してください"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -238,63 -182,49 +238,63 @@@ msgstr "
"パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A %s"
"%%0A %s%%0Aを保護します。"
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "以下のシリアル番号のカードを挿入してください"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "今のカードを抜き、以下のシリアル番号のカードを挿入してください"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "管理者PIN"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "リセット・コード"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0Aリーダーのピンパッドを入力に使ってください。"
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "このリセット・コードをもう一度入力してください"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "このPUKをもう一度入力してください"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "このPINをもう一度入力してください"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "リセット・コードが正しく繰り返されていません。もう一度"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUKが正しく繰り返されていません。もう一度"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PINが正しく繰り返されていません。もう一度"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "カードのロックを解除するためにPIN%s%s%sを入力してください"
@@@ -370,8 -287,6 +370,8 @@@ msgstr "新しい鍵を保護するた�
msgid "Please enter the new passphrase"
msgstr "新しいパスフレーズを入力してください"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -379,132 -294,96 +379,136 @@@ msgstr "
"@オプション:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "デーモン・モードで実行 (バックグラウンド)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "サーバ・モードで実行 (フォアグラウンド)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
msgid "run in supervised mode"
msgstr "スーパーバイズド・モードで実行"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "いくらかおとなしく"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "sh-形式のコマンド出力"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "csh-形式のコマンド出力"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FILE|FILEからオプションを読み込みます"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "コンソールからデタッチしない"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "キーボードとマウスを占有しない"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "サーバのログ・ファイルを使う"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|PGMをPIN入力プログラムとして使う"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|PGMをSCdaemonプログラムとして使う"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "SCdaemonを使わない"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|NAMEからのコマンドを受け付ける"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "TTYの変更要求を無視する"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "Xディスプレイの変更要求を無視する"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|N秒後に保持したPINを無効とする"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "署名に対してPINの保持を使わない"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "disallow the use of an external password cache"
msgstr "外部のパスワードキャッシュの使用を認めない"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "クライアントが鍵に\"trusted\"マークをつけることを認めない"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "パスフレーズの事前設定を認める"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr "pinentryより優先してパスフレーズ入力を認めない"
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr "Emacsを通じてパスフレーズを催促することを認める"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "sshサポートを有功にする"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "バグは <@EMAIL@> までご報告ください。\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "使い方: @GPG_AGENT@ [オプション] (ヘルプは -h)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -512,143 -391,109 +516,148 @@@ msgstr "
"形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の秘密鍵の管理\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "無効なdebug-level '%s'が与えられました\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "オプション・ファイル '%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "'%s' からオプションを読み込みます\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "*注意*: '%s'はオプションとは考えられません\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "ソケットが作成できません: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "ソケット名'%s'は長すぎます\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "ソケットのナンス取得エラー\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "'%s'でソケットのバインドのエラー: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "'%s'の許可が設定できません: %s\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() に失敗しました: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
msgid "listening on socket '%s'\n"
msgstr "ソケット'%s'でlisten\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 g10/openfile.c:398
+#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "ディレクトリ'%s'が作成されました\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s'でstat()が失敗しました: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "'%s'をホーム・ディレクトリに使えません\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %dでナンスの読み込みエラー: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
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:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 停止しました\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "使い方: gpg-preset-passphrase [オプション] KEYGRIP (ヘルプは -h)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -656,8 -501,6 +665,8 @@@ msgstr "
"形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
"パスワードキャッシュの管理\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -665,9 -508,6 +674,9 @@@ msgstr "
"@コマンド:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -723,8 -555,6 +732,8 @@@ msgstr "キャンセルされました\
msgid "error while asking for the passphrase: %s\n"
msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "'%s'を開く際、エラー: %s\n"
@@@ -782,8 -603,6 +791,8 @@@ msgstr "究極的にこれを信用し%
msgid "Yes"
msgstr "はい"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "いいえ"
@@@ -837,18 -649,15 +846,18 @@@ msgstr "パスフレーズを変更す�
msgid "I'll change it later"
msgstr "後で変更する"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "鍵を削除する"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -870,7 -676,6 +879,7 @@@ msgstr "%s 鍵は安全でない(%uビ�
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "%zuビットのハッシュは%uビットの%s鍵には無効です\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "作成された署名の検査に失敗しました: %s\n"
@@@ -908,8 -703,6 +917,8 @@@ msgstr "パイプの作成エラー: %s
msgid "error creating a stream for a pipe: %s\n"
msgstr "パイプのストリーム作成エラー: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "プロセスforkエラー: %s\n"
@@@ -1034,7 -801,6 +1043,7 @@@ msgstr "%luバイトの確保におい�
msgid "out of core while allocating %lu bytes"
msgstr "%luバイトの確保においてメモリが足りません"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "十分なメモリの確保のエラー: %s\n"
@@@ -1051,7 -815,6 +1060,7 @@@ msgid "WARNING: \"%s%s\" is an obsolet
msgstr ""
"*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "未知のdebugフラグ'%s'は無視されました\n"
@@@ -1155,8 -895,6 +1164,8 @@@ msgstr "セッション・キーが作�
msgid "algorithm: %s"
msgstr "アルゴリズム: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "サポートされていないアルゴリズム: %s"
@@@ -1322,7 -1022,6 +1331,7 @@@ msgstr "無効なオプション
msgid "missing argument for option \"%.50s\"\n"
msgstr "オプション\"%.50s\"に引数がありません\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "オプション\"%.50s\"には無効な引数です\n"
@@@ -1347,7 -1042,6 +1356,7 @@@ msgstr "オプション\"%.50s\"はあ�
msgid "command \"%.50s\" is ambiguous\n"
msgstr "コマンド\"%.50s\"はあいまいです\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "メモリがありません\n"
@@@ -1405,8 -1088,6 +1414,8 @@@ msgstr "lock '%s' は作成されませ
msgid "waiting for lock %s...\n"
msgstr "lock %s を待ちます...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
@@@ -1526,7 -1181,6 +1535,7 @@@ msgstr "注釈名には印字可能な�
msgid "WARNING: invalid notation data found\n"
msgstr "*警告*: 無効な注釈データを発見\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "プロキシ%sのクライアントへの問い合わせが失敗しました\n"
@@@ -1535,33 -1188,31 +1544,40 @@@
msgid "Enter passphrase: "
msgstr "パスフレーズを入力: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, c-format
msgid "error getting version from '%s': %s\n"
msgstr "%s'からバージョン取得エラー: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr "サーバ'%s'はこちらより古いです(%s < %s)"
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, c-format
msgid "WARNING: %s\n"
msgstr "*警告*: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%sは%sではまだ機能しません\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGPカードが利用できません: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPカードno. %sを検出\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "これはバッチ・モードではできません\n"
@@@ -1569,14 -1219,9 +1585,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "このコマンドが使えるのはバージョン2のカードだけです\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "リセット・コードが(もはや)利用可能ではありません\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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "あなたの選択は? "
@@@ -1633,90 -1265,55 +1649,75 @@@ msgstr "エラー: つないだ名前�
msgid "URL to retrieve public key: "
msgstr "公開鍵を取得するURL: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "エラー: URLが長すぎます (上限%d文字)。\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
msgid "error reading '%s': %s\n"
msgstr "'%s'の読み込みエラー: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "ログイン・データ (アカウント名): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "エラー: ログイン・データが長すぎます (上限%d文字)。\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "プライベート DO データ: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "エラー: プライベート DOが長すぎます (上限%d文字)。\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "言語の優先指定: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "エラー: 優先指定の文字列の長さが無効です。\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "エラー: 優先指定の文字列に無効な文字があります。\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性別 ((M)男、(F)女、または空白): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "エラー: 無効な応答。\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "CAのフィンガープリント: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "エラー: 無効な形式のフィンガープリント。\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "鍵は操作できません: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "OpenPGPカードでありません"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "現行鍵情報の取得エラー: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "既存の鍵を置き換えしますか? (y/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1726,55 -1323,43 +1727,55 @@@ msgstr "
" 鍵生成が成功しない場合、あなたのカードに関する技術文書を確認し、\n"
" 利用できる鍵長について確認ください。\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "署名鍵の鍵長は? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "暗号化鍵の鍵長は? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "認証鍵の鍵長は? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%uビットに切り上げます\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "今、%uビットの鍵を生成するようにカードは再コンフィグされました\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "鍵%dの長さを%u bit に変更する際にエラー: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "暗号化鍵のカード外バックアップを作成しますか? (Y/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "*注意*: 秘密鍵はもうカードに保管してあります!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "既存の鍵を置き換えますか? (y/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1785,161 -1370,117 +1786,161 @@@ msgstr "
" PIN = '%s' 管理者PIN = '%s'\n"
"次のコマンドを使って変更すべきです --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "生成する鍵の型を選択してください:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) 署名鍵\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) 暗号化鍵\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) 認証鍵\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "無効な選択です。\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "鍵を保管する場所を選択してください:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "KEYTOCARDが失敗しました: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
msgid "This command is not supported by this card\n"
msgstr "このカードでは、このコマンドはサポートされていません。\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "*注意*: このコマンドはカードに保管してあるすべての鍵を破壊します!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
msgid "Continue? (y/N) "
msgstr "続けますか? (y/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "このメニューを終了"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "管理コマンドを表示"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "このヘルプを表示"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "全有効データを表示"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "カード所有者の名前の変更"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "鍵を取得するURLの変更"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "カードURLで指定された鍵の取得"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "ログイン名の変更"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "言語の優先指定の変更"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "カード所有者の性別の変更"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "CAフィンガープリントの変更"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "署名強制PINフラグを反転"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "新しい鍵を生成"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "PINブロックの解除や変更のメニュー"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "PINを確認しすべてのデータを表示する"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "PINをリセット・コードでブロックを解除する"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr "すべての鍵とデータを破壊します"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "管理者専用コマンド\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "管理者コマンドが許可されています\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "管理者コマンドは禁止されています\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "無効なコマンド (\"help\"を参照)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "このコマンドで--outputは機能しません\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "鍵\"%s\"が見つかりません: %s\n"
- #: 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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "鍵ブロックの読み込みエラー: %s\n"
@@@ -1996,43 -1525,46 +1997,57 @@@ msgstr "この公開鍵にたいする�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "パスフレーズの作成エラー: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2Kモードのため、共通鍵ESKパケットを使えません\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "暗号方式 %s を使います\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s'はもう圧縮済みです\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "*警告*: '%s'は空のファイルです\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "'%s'から読み込み\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr ""
+ "*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2040,37 -1572,31 +2055,38 @@@
msgstr ""
"*警告*: 圧縮アルゴリズム %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s暗号化 受信者:\"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "%sを%sモードで使うことはできません\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s暗号化済みデータ\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "不明のアルゴリズム%dによる暗号化\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "*警告*: メッセージは共通鍵暗号方式の弱い鍵で暗号化されています。\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "暗号化パケットの取扱いで障害\n"
@@@ -2152,36 -1661,27 +2168,36 @@@ msgstr "エクスポートの際、で�
msgid "use the GnuPG key backup format"
msgstr "GnuPGの鍵のバックアップフォーマットを使います"
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
msgstr " - スキップされました"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "'%s'への書き込み\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "秘密鍵のエクスポートは認められません\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "*警告*: 何もエクスポートされていません\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2245,213 -1732,165 +2261,218 @@@ msgstr "デフォルトの署名用の�
msgid "all values passed to '%s' ignored\n"
msgstr "'%s'に渡されたすべての値は無視されました\n"
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
- #: g10/getkey.c:3637
++#: g10/getkey.c:3658
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "副鍵%s(主鍵%sではなく)を用います\n"
- #: g10/gpg.c:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "オプション'%s'に有効な値:\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "署名を作成"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "クリア・テクスト署名を作成"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "分遣署名を作成"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "データを暗号化"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "暗号化には共通鍵暗号方式のみを使用"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "データを復号 (デフォルト)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "署名を検証"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "鍵の一覧"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "鍵と署名の一覧"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "鍵署名の検査と一覧"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "鍵とフィンガープリントの一覧"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "秘密鍵の一覧"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "新しい鍵ペアを生成"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "すばやく新しい鍵ペアを生成"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
msgid "quickly add a new user-id"
msgstr "すばやく新しいユーザIDを追加"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly revoke a user-id"
msgstr "すばやくユーザIDを失効"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "quickly set a new expiration date"
msgstr "すばやく新しい有効期限を設定"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "全機能の鍵ペアを生成"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "失効証明書を生成"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "公開鍵リングから鍵を削除"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "秘密鍵リングから鍵を削除"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "鍵にすばやく署名"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "鍵へすばやくローカルに署名"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "鍵に署名"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "鍵へローカルに署名"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "鍵への署名や編集"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "パスフレーズの変更"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "鍵をエクスポートする"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "鍵サーバに鍵をエクスポートする"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "鍵サーバから鍵をインポートする"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "鍵サーバの鍵を検索する"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "鍵サーバから鍵を全部更新する"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "鍵のインポート/マージ"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "カード・ステイタスを表示"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "カードのデータを変更"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "カードのPINを変更"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "信用データベースを更新"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "メッセージ・ダイジェストを表示"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "サーバ・モードで実行"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|TOFUポリシーを鍵に設定する"
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "ASCII形式の外装を作成"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|USER-ID用に暗号化"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "正準テキスト・モードを使用"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FILE|出力をFILEに書き出す"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "無変更"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "上書き前に確認"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "厳密なOpenPGPの振舞を採用"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2459,7 -1898,6 +2480,7 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
msgid ""
"@\n"
"Examples:\n"
@@@ -2479,11 -1917,9 +2500,11 @@@ msgstr "
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガープリントを表示\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2493,7 -1929,6 +2514,7 @@@ msgstr "
"署名、検査、暗号化または復号\n"
"デフォルトの操作は、入力データに依存\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2501,527 -1936,400 +2522,513 @@@ msgstr "
"\n"
"サポートしているアルゴリズム:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "公開鍵: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "暗号方式: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "ハッシュ: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "圧縮: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "使い方: %s [オプション] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない所有\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない所有\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない許可\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない許可\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "不明のコンフィグレーション項目'%s'\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "鍵の一覧時にフォトIDを表示する"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "署名の一覧時にポリシーURLを表示する"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "署名の一覧時にすべての注釈を表示する"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "署名の一覧時にIETF標準注釈を表示する"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "署名の一覧時にユーザの注釈を表示する"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "署名の一覧時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "鍵の一覧時にユーザIDの有効性を表示する"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "鍵の一覧に鍵リングの名前を表示する"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "署名の一覧時に有効期限の日付を表示する"
- #: g10/gpg.c:2058 g10/gpg.c:2095
- #, c-format
- msgid "valid values for option '%s':\n"
- msgstr "オプション'%s'に有効な値:\n"
-
- #: g10/gpg.c:2069
++#: g10/gpg.c:2074
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "不明のTOFUポリシー'%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
- #: g10/gpg.c:2105 g10/keygen.c:168
- #, c-format
- msgid "invalid value for option '%s'\n"
- msgstr "オプション'%s'に無効な値です\n"
-
- #: g10/gpg.c:2244
++#: g10/gpg.c:2227
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "*注意*: 普通%sは使いません!\n"
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s'は、有効な署名表現ではありません\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "\"%s\"は正しいメール・アドレスではありません\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無効な pinentry mode '%s'です\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s'は、有効な文字集合ではありません\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無効なインポート・オプションです\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "無効なインポート・オプションです\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, c-format
msgid "invalid filter option: %s\n"
msgstr "無効なフィルタ・オプションです: %s\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無効な一覧オプションです\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "無効な一覧オプションです\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "署名の検証時にフォトIDを表示する"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "署名の検証時にポリシーURLを表示する"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "署名の検証時にすべての注釈を表示する"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "署名の検証時にIETF標準注釈を表示する"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "署名の検証時にユーザの注釈を表示する"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "署名の検証時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "署名の検証時にユーザIDの有効性を表示する"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr "署名の検証時にプライマリ・ユーザIDだけをを表示する"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "PKAデータで署名を検証する"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "有効なPKAデータで署名の信用度を上昇させる"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無効な検証オプションです\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "無効な検証オプションです\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-pathを%sに設定不能\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%sは%sとともに使うことはできません!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "選択された圧縮アルゴリズムは、無効です\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-neededは正の値が必要です\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neededは1より大きな値が必要です\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
- #: g10/gpg.c:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
- #: g10/gpg.c:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "無効なデフォルトの優先指定\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "無効な個人用暗号方式の優先指定\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "無効な個人用ダイジェストの優先指定\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "無効な個人用圧縮の優先指定\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%sは%sではまだ機能しません\n"
- #: 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:3863
- #, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+ #, fuzzy, c-format
+ #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3868
- #, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+ #, fuzzy, c-format
+ #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信用データベースの初期化に失敗しました: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "鍵サーバへの送信に失敗しました: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "鍵サーバからの受信に失敗しました: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "鍵のエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "鍵サーバの検索に失敗しました: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "鍵サーバの更新に失敗しました: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "外装除去に失敗しました: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "外装に失敗しました: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "鍵指定'%s'の構文解析エラー: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, 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:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
"警告: コマンドが指定されていません。なにを意味しているのか当ててみます ...\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "開始します。メッセージを打ってください ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "あたえられた証明書ポリシーURLは無効です\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "あたえられた署名ポリシーURLは無効です\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "指定された優先鍵サーバURLは無効です\n"
@@@ -3033,7 -2339,6 +3040,7 @@@ msgstr "|FILE|鍵リングFILEの鍵を
msgid "make timestamp conflicts only a warning"
msgstr "日時の矛盾を警告だけにします"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|このFDにステイタス情報を書き出す"
@@@ -3062,137 -2362,113 +3069,143 @@@ msgstr "ヘルプはありません
msgid "No help available for '%s'"
msgstr "'%s'のヘルプはありません"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "ローカルだけとマークされた署名をインポートします"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
- #: g10/import.c:158
++#: g10/import.c:166
msgid "do not clear the ownertrust values during import"
msgstr "インポートの際、所有者信用の値をクリアしない"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "インポート後、信用データベースを更新しない"
- #: g10/import.c:164
++#: g10/import.c:172
msgid "show key during import"
msgstr "インポートの際、鍵を表示"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "既存の鍵に対する更新のみ認めます"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "インポート後、利用できない部分を鍵から除去します"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "インポート後、できるだけ除去します"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr "インポート・フィルタを実行し鍵をすぐにエクスポートします"
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr "GnuPGの鍵のバックアップフォーマットを仮定します"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key during import"
+ msgid "repair keys on import"
+ msgstr "インポートの際、鍵を表示"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "型%dのブロックをスキップします\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "これまで%lu個の鍵を処理\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr " 処理数の合計: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " スキップしたPGP-2鍵: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " スキップした新しい鍵: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ユーザIDなし: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " インポート: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 変更なし: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新しいユーザID: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新しい副鍵: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新しい署名: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新しい鍵の失効: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 秘密鍵の読み込み: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 秘密鍵のインポート: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 無変更の秘密鍵: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未インポート: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 掃除された署名: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 掃除されたユーザID: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3201,187 -2477,149 +3214,187 @@@ msgstr "
"*警告*: 鍵%sには、これらのユーザIDに対して使用不可のアルゴリズムの優先指定が"
"あります\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 暗号アルゴリズムの優先指定 %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": ダイジェスト・アルゴリズムの優先指定 %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 圧縮アルゴリズムの優先指定 %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "あなたの優先指定を更新し、この鍵を再配布することが強く推奨されます\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "それによって、潜在的なアルゴリズム不一致の問題を避けられます\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "以下で、優先指定を更新できます: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "鍵%s: ユーザIDがありません\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "鍵 %s: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "インポートの検査で拒否されました"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "鍵%s: PKSの副鍵変造を修復\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "鍵%s: 受理した未自己署名のユーザID\"%s\"\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "鍵%s: 有効なユーザIDがありません\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "これはおそらく自己署名のないせいでしょう\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "鍵%s: 新しい鍵です - スキップします\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "鍵%s: こちらの複製と合いません\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "鍵%s:\"%s\"変更なし\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "鍵%s: 秘密鍵をインポートしました\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "鍵 %s: 秘密鍵はもうあります\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "秘密鍵 %s: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "秘密鍵のインポートは禁止です\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
@@@ -3396,137 -2634,110 +3409,137 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "鍵%s: 無効な直接鍵署名\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "鍵%s: 無効な副鍵の対応です\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "鍵%s: 多重副鍵の対応を削除します\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "鍵%s: 無効な副鍵失効です\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "鍵%s: スキップした副鍵\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "鍵%s:\"%s\"失効証明書の追加\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "鍵%s: 直接鍵署名を追加\n"
@@@ -3566,75 -2770,12 +3579,15 @@@ msgstr "鍵DBを開く際のエラー:
msgid "failed to rebuild keyring cache: %s\n"
msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[失効]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[自己署名]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
-
- #: g10/keyedit.c:642
- #, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr ""
- "サポートしていないメッセージ・ダイジェスト(%d)の署名は確認できません: %s.\n"
-
- #: g10/keyedit.c:805
- msgid " (reordered signatures follow)"
- msgstr "(順番を変えた署名が続きます)"
-
- #: g10/keyedit.c:918
- #, c-format
- msgid "key %s:\n"
- msgstr "鍵 %s:\n"
-
- #: g10/keyedit.c:921
- #, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "%d個の重複した署名が除去されました\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個の署名は検査しません\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"
-
- #: g10/keyedit.c:932
- #, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "%d個の正しい署名\n"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
- "警告: エラーがあり、自己署名だけ確認しました。'%s'を実行してすべての署名を確"
- "認ください。\n"
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3645,17 -2786,14 +3598,17 @@@ msgstr "
"(パスポートを見せてもらったり、他から得たフィンガープリントを検査したり、など"
"など)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = まぁまぁ信用する\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 充分に信用する\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3664,50 -2802,38 +3617,50 @@@ msgstr "
"信用署名の深さを入力してください。\n"
"深さが1より大きいと、署名しようとしている鍵で信用署名を作れます。\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "ユーザID\"%s\"をスキップします、テキストのIDではありません。\n"
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ユーザID\"%s\"は、失効されています。"
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "それでもこの鍵に署名したいですか? (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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " 署名不能。\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ユーザID \"%s\"は、期限切れです。"
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ユーザID \"%s\"は、自己署名されていません。"
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ユーザID \"%s\"は署名可能です。 "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "署名しますか? (y/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3716,11 -2842,9 +3669,11 @@@ msgstr "
"\"%s\"にたいする自己署名は、\n"
"PGP 2.x形式の署名です。\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3729,11 -2853,9 +3682,11 @@@ msgstr "
"\"%s\"に対するあなたの今の署名\n"
"は期限切れです。\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "新しい署名を発行し、期限切れ署名と置き換えたいですか? (y/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3742,43 -2864,34 +3695,43 @@@ msgstr "
"\"%s\"にたいするあなたの今の署名\n"
"はローカルな署名です。\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "エクスポート可能な署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\"は鍵%sでもうローカルに署名してあります\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\"は鍵%sでもう署名してあります\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "それでも再署名したいですか? (y/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "鍵%sで署名すべきものはありません\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "この鍵は期限切れです!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "この鍵は%sで期限が切れます。\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "同時に署名も期限切れとしたいですか? (Y/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3787,31 -2900,25 +3740,31 @@@ msgstr "
"署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
"注意して検証しましたか? 答がわからなければ、\"0\"を入力してください。\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 答えません。%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 全然、検査していません。%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 一応、検査しました。%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) かなり注意して検査しました。%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "選択は? (詳細は '?'): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3820,220 -2927,166 +3773,220 @@@ msgstr "
"本当にこの鍵にあなたの鍵\"%s\"で署名してよいですか\n"
"(%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "自己署名になるでしょう。\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "*警告*: 署名は、エクスポート不可に設定されません。\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "*警告*: 署名は、失効不可に設定されません。\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "署名は、エクスポート不可に設定されます。\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "署名は、失効不可に設定されます。\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "この鍵は全然、検査していません。\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "この鍵は一応、検査しました。\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "この鍵は、かなり注意して検査しました。\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "本当に署名しますか? (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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "署名に失敗しました: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"鍵にはスタブあるいはカード上の項目しかありません - パスフレーズは変更されませ"
"ん。\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "保存して終了"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "鍵のフィンガープリントを表示"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
msgid "show the keygrip"
msgstr "keygripを表示"
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "鍵とユーザIDの一覧"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "ユーザID Nの選択"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "副鍵Nの選択"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "署名の確認"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr "選択したユーザIDに署名する [* 以下の関連コマンドを参照 ]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "選択したユーザIDにローカルに署名"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "選択したユーザIDに信用署名を署名する"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "選択したユーザIDに失効不可の署名をする"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "ユーザIDの追加"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "フォトIDの追加"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "選択したユーザIDの削除"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "副鍵を追加"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "スマートカードへ鍵の追加"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "鍵をスマートカードへ移動"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "バックアップ鍵をスマートカードへ移動"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "選択した副鍵の削除"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "失効鍵の追加"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "選択したユーザIDから署名を削除する"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "鍵または選択した副鍵の有効期限を変更する"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "選択したユーザIDを主にする"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "優先指定の一覧 (エキスパート)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "優先指定の一覧 (冗長)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "選択したユーザIDに優先指定リストを設定"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "選択したユーザIDに優先鍵サーバのURLを設定"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "選択したユーザIDに注釈を設定する"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "パスフレーズの変更"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "所有者信用の変更"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "選択したユーザIDの署名を失効"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "選択したユーザIDの失効"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "鍵の失効または選択した副鍵の失効"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "鍵を有効にする"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "鍵を無効にする"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "選択したフォトIDを表示"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "使えないユーザIDをコンパクトにし、使えない署名を鍵から除去"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "使えないユーザIDをコンパクトにし、すべての署名を鍵から除去"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "秘密鍵が利用できます。\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "この実行には秘密鍵がいります。\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4044,269 -3097,217 +3997,281 @@@ msgstr "
" 't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
" (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "鍵は、失効されています。"
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "本当に全ユーザIDに署名しますか? (y/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
msgid "Really sign all text user IDs? (y/N) "
msgstr "本当に全てのテキストユーザIDに署名しますか? (y/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "ヒント: まず署名するユーザIDを選択します\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "不明の署名タイプ'%s'\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%sモードでこのコマンドは禁止です。\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "ユーザIDを少なくともひとつ選択してください。\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "('%s'コマンドを使用してください。)\n"
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "最後のユーザIDは削除できません!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "このユーザIDを本当に削除しますか? (y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "この主鍵を本当に移動しますか? (y/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "鍵をきっかり1つ選択してください。\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "コマンドはファイル名の引数を期待します\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "バックアップ鍵を'%s'から読み込みする際のエラー: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "鍵を少なくとも1本選択してください。\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "選択した鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "この鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "このユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "この鍵全体を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "選択した副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "この副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"ユーザが指定した信用データベースを利用中、所有者信用は設定できません。\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "優先指定の一覧を設定:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "選択したユーザIDの優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "変更を保存しますか? (y/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "保存せずに終了しますか? (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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "更新に失敗しました: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "鍵は無変更なので更新は不要です。\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
msgid "cannot revoke the last valid user ID.\n"
msgstr "最後の有効なユーザIDは失効できません。\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "ユーザIDの失効に失敗しました: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "プライマリ・ユーザIDの設定に失敗しました: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\"はフィンガープリントではありません\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "無効なユーザID '%s': %s\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "マッチするユーザIDはありません。"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "署名するものがありません。\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "'%s'は、有効な有効期限ではありません\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "\"%s\" is not a fingerprint\n"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "\"%s\"はフィンガープリントではありません\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "鍵\"%s\"が見つかりません\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "ダイジェスト: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "機能: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "鍵サーバ 修正しない"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "優先鍵サーバ: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "注釈: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "この鍵は、%s鍵%sによって失効可能です"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(機密指定)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "作成: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "失効: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "期限切れ: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "有効期限: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "利用法: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "カード番号: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "信用: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "有効性: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "この鍵は使用禁止に設定されています"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4314,18 -3315,12 +4279,18 @@@ msgstr "
"プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
"ということを念頭においてください。\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "期限切れ"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4333,15 -3328,12 +4298,15 @@@ msgstr "
"*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
" ユーザIDが主になると仮定する場合があります。\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "その有効期限も変更したいでしょう\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4351,70 -3343,55 +4316,70 @@@ msgstr "
"は、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "それでも追加したいですか? (y/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "この正しい署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "この無効な署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "この不明の署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "この自己署名を本当に削除しますか? (y/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "%d個の署名を削除しました。\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "何も削除していません。\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "無効"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "ユーザID \"%s\": %d の署名が除去されました\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ユーザID \"%s\": 既に最小化されています\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4424,204 -3401,163 +4389,209 @@@ msgstr "
"では、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "指名失効者のユーザIDを入力してください: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "指名失効者には、その鍵自体を任命できません\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "この鍵は失効者としてもう指名されています\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "本当に複数の副鍵の失効期限を変更しますか? (y/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "副鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "主鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3鍵の有効期限は変更できません\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "署名する副鍵%sはすでに相互証明されています\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "ユーザIDをきっかりひとつ選択してください。\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "優先鍵サーバURLを入力してください: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "本当に置き換えたいですか? (y/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "本当に削除したいですか? (y/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "注釈を入力: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "進みますか? (y/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d番のユーザIDはありません\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "ハッシュ%sのユーザIDはありません\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "鍵ID'%s'の副鍵はありません\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d番の副鍵はありません\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ユーザID:\"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%sで%s%s%sに署名されています\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (エクスポート不可)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "この署名は%sで期限切れです。\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "それでも本当に失効したいですか? (y/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "あなたによって署名されていません。\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "これらのユーザIDに鍵%sで署名しました:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (失効不可)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "あなたの鍵%sで%sに失効されています\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "これらの署名を失効しようとしています:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "失効証明書を本当に作成しますか? (y/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "秘密鍵がありません\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr "ユーザIDでないものを失効しようとしました: %s\n"
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ユーザID\"%s\"は、もう失効されています\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
msgid "Cannot revoke the last valid user ID.\n"
msgstr "最後の有効なユーザIDは失効できません。\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "副鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
++#: g10/keygen.c:168
+ #, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "オプション'%s'に無効な値です\n"
+
+#: g10/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "優先指定'%s'の重複\n"
@@@ -5050,8 -3909,6 +5020,8 @@@ msgstr "
"す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
"成器に十分なエントロピーを供給する機会を与えることができます。\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "鍵の生成に失敗しました: %s\n"
@@@ -5122,7 -3966,6 +5092,7 @@@ msgstr "公開鍵リング'%s'の書き
msgid "public and secret key created and signed.\n"
msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5130,103 -3973,91 +5100,115 @@@ msgstr "
"この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
"\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "主鍵の秘密部分が利用できません。\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鍵の秘密部分はカード上に保存されています。\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "本当に作成しますか? (y/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "無期限 "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "クリティカルな署名ポリシー: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "署名ポリシー: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "クリティカルな優先鍵サーバ: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "クリティカルな署名注釈: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "署名注釈: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "正しい署名%d個\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, c-format
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d個の不正な署名\n"
+
++#: g10/keylist.c:482
+ #, c-format
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "鍵がないため%d個の署名は検査しません\n"
+
++#: g10/keylist.c:487
#, 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個の署名を検査しません\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] "*警告*: %lu個の鍵がその大きさのためスキップされました\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "鍵リング"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " 副鍵フィンガープリント:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " 副鍵フィンガープリント:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " フィンガープリント ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " カードシリアル番号 ="
@@@ -5328,254 -4138,205 +5310,260 @@@ msgstr "鍵が鍵サーバに見つか�
msgid "no keyserver known (use option --keyserver)\n"
msgstr "既知の鍵サーバがありません (オプション--keyserverを使いましょう)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "鍵%sを%sからサーバ%sに要求\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "鍵%sを%sに要求\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
msgid "no keyserver known\n"
msgstr "鍵サーバがわかりません\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\"をスキップしました: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "鍵%sを%sへ送信\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "鍵を'%s'から要求\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "*警告*: URI %s からデータを取れません: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "変な長さの暗号化済みセッション鍵 (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 暗号化済みセッション鍵\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "不明のダイジェスト・アルゴリズムで生成されたパスフレーズ %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "公開鍵は%sです\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "公開鍵による暗号化済みデータ: 正しいDEKです\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "%u-ビット%s鍵, ID %s, 日付%sに暗号化されました\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "%s鍵, ID %sで暗号化されました\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公開鍵の復号に失敗しました: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu 個のパスフレーズで暗号化\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "1 個のパスフレーズで暗号化\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s暗号化済みデータを仮定\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA暗号方式は利用不能なので、楽天的ですが%sで代用しようとしています\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "*警告*: メッセージの完全性は保護されていません\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "復号に成功\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "*警告*: 暗号化されたメッセージは改竄されています!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "復号に失敗しました: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "*注意*: 送信者は\"極秘とする\"ように求めています\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "元のファイル名='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "*警告*: 複数のプレインテクストが見られます\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "署名が見つかりません\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\"からの*不正な*署名"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\"からの期限切れの署名"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\"からの正しい署名"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "署名の検証を省略\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "このあいまいな署名データは取り扱えません\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "%sに施された署名\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " %s鍵%sを使用\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%sに%s鍵ID %sで施された署名\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, c-format
msgid " issuer \"%s\"\n"
msgstr " 発行者\"%s\"\n"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "以下に鍵があります: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[不確定]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " 別名\"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "*警告*: この鍵は信用できる署名で証明されていません!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "期限切れの署名 %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "この署名は%sで期限切れとなります\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "バイナリ"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "テキストモード"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "不明の"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr "、鍵アルゴリズム "
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
"*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "署名を検査できません: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "分遣署名でありません\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "クラス0x%02xのスタンドアロン署名\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "古い形式 (PGP 2.x) の署名\n"
@@@ -5632,34 -4382,28 +5620,34 @@@ msgstr "(報告されたエラー: %s <
msgid "(further info: "
msgstr "(より詳細な情報: "
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 廃止されたオプション\"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "*警告*: \"%s\"は、廃止されたオプションです\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "\"%s%s\"を代わりに使ってください\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "*警告*: \"%s\" は、廃止されているコマンドです - 使わないでください\n"
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5667,35 -4411,28 +5655,35 @@@ msgstr "
"*警告*: \"%s%s\"は、使われなくなったオプションです - %s以外になんの効果もあり"
"ません\n"
- #: g10/misc.c:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "無圧縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "無圧縮|なし"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "このメッセージは、%sでは使用できません\n"
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "あいまいなオプション'%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "不明のオプション'%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSAの公開鍵は8ビットの倍数のSECエンコーディングを期待します\n"
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "不明の弱いダイジェスト'%s'\n"
@@@ -6183,35 -4821,33 +6171,41 @@@ msgstr "署名されたデータ'%s'が
msgid "can't open signed data fd=%d: %s\n"
msgstr "署名されたデータ fd=%d が開けません: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "証明書は暗号化のために使えません\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "匿名の受取人用です。秘密鍵%sを試します ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "終了。匿名の受取人用です。\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "DEKの旧式エンコーディングは、サポートしていません\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "暗号アルゴリズム%d%sは不明か使用禁止です\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "*警告*: 暗号アルゴリズム%sは受取人の優先指定に入っていません\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "*注意*: 秘密鍵%sは%sで期限切れとなります\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "*注意*: 鍵は失効済みです"
@@@ -6375,7 -4983,6 +6369,7 @@@ msgstr "(説明はありません)\n
msgid "Is this okay? (y/N) "
msgstr "よろしいですか? (y/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "弱い鍵ができました - 再実行\n"
@@@ -6395,38 -4999,36 +6389,44 @@@ msgid "%s key %s requires a %zu bit or
msgstr ""
"%s鍵%sは%zuビットあるいはより大きいハッシュを必要とします(今のハッシュは%s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "*警告*: 署名のダイジェストが、メッセージと衝突します\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "%sを%sモードで使うことはできません\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "*警告*: 署名副鍵%sは、相互証明されてません\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "詳細は%sをご覧ください\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "*警告*: 無効な相互証明が、署名副鍵%sにあります\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "公開鍵%sは、署名よりも%lu秒、新しいものです\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公開鍵%sは、署名よりも%lu日、新しいものです\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6434,62 -5036,51 +6434,62 @@@ msgid_plural "
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr[0] "鍵%sは%lu秒、未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, 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] "鍵%sは%lu日、未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "*注意*: 署名鍵%sは%sに期限切れとなります\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "*注意*: 鍵 %s は失効済みです\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "不明のクリティカル・ビットにより、鍵%sの署名を不正とみなします\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "鍵%s: 副鍵失効署名にたいする副鍵がありません\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "鍵%s: 副鍵対応への署名にたいする副鍵がありません\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "*警告*: 表記を%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "*警告*: ポリシーURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "*警告*: 優先鍵サーバURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s署名。署名者:\"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6497,31 -5088,25 +6497,31 @@@ msgstr "
"*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
"ます\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "署名:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s暗号化を使用します\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"セキュアでないというフラグが鍵には設定されていません。\n"
"偽物乱数生成器とはいっしょに使えません!\n"
- #: g10/skclist.c:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"をスキップします: 重複\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "スキップ: 秘密鍵はもうあります\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "これはPGPの生成したElgamal鍵で、署名用には安全ではありません!"
@@@ -6604,7 -5173,6 +6604,7 @@@ msgstr "信用データベースのト�
msgid "%s: directory does not exist!\n"
msgstr "%s: ディレクトリがありません!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "'%s'にアクセスできません: %s\n"
@@@ -6713,91 -5259,71 +6713,91 @@@ msgstr "%d文字以上の長さのテ�
msgid "input line longer than %d characters\n"
msgstr "入力行の長さが%d文字を超えています\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "TOFUデータベースのトランザクション開始エラー: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "TOFUデータベースのトランザクションコミットのエラー: %s\n"
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "TOFUデータベースのトランザクションのロールバックのエラー: %s\n"
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "サポートされていないTOFUデータベースバージョン: %s\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "'ultimately_trusted_keys' TOFUテーブル作成エラー: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr "TOFU DBエラー"
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "TOFUデータベースの読み込みエラー: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "TOFUデータベースのバージョン判定エラー: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "TOFUデータベースの初期化エラー: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "'encryptions' TOFUデータベースの作成エラー: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr "バインディングDBにカラムeffective_policyを追加: %s\n"
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "TOFUデータベースのオープンでエラー '%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "TOFUデータベースの更新エラー: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr "電子メールアドレス\"%s\"が鍵%sに使われたのはこれが最初です。"
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, c-format
msgid "The email address \"%s\" is associated with %d key!"
msgid_plural "The email address \"%s\" is associated with %d keys!"
msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます!"
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
" このバインディングポリシーは'auto'だったので、'ask'に変更されました。"
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
@@@ -6806,106 -5332,87 +6806,106 @@@ msgstr "
"この電子メールアドレスが鍵 %s に結びつけられるべきか、あるいは誰かが\"%s\" に"
"なりすましていると思うか指定してください。"
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "ほかのユーザIDの収集エラー: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
msgid "This key's user IDs:\n"
msgstr "この鍵のユーザID:\n"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, c-format
msgid "policy: %s"
msgstr "ポリシー: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "署名の統計の収集エラー: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "この電子メールアドレス\"%s\"の鍵の統計:\n"
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
msgid "this key"
msgstr "この鍵"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "%d個のメッセージを検証しました。"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
msgstr[0] "%d個のメッセージを暗号化しました。"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "%d個のメッセージが未来に検証されました。"
- #: g10/tofu.c:1839
++#: g10/tofu.c:1838
#, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "%d個のメッセージが未来に暗号化されました。"
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr "これまでに検証されたメッセージの数: %d."
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, c-format
msgid "Messages encrypted in the past: %d."
msgstr "これまでに暗号化されたメッセージの数: %d."
@@@ -6913,138 -5420,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
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:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr "不明をデフォルトとします。\n"
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr "TOFU dbが壊れていることが検出されました。\n"
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, c-format
msgid "resetting keydb: %s\n"
msgstr "keydbをリセット: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "TOFUバインディングのポリシーを %s に設定エラー\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "TOFUポリシーの作成エラー: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] "%lld年"
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] "%lld月"
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] "%lld週"
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] "%lld日"
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] "%lld時間"
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] "%lld分"
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] "%lld秒"
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr "%s: 0個の署名を検証、0個のメッセージを暗号化しました。"
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, c-format
msgid "%s: Verified 0 signatures."
msgstr "%s: 0個の署名を検証しました。"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
msgid "Encrypted 0 messages."
msgstr "0 個のメッセージを暗号化しました。"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, c-format
msgid "(policy: %s)"
msgstr "(ポリシー: %s)"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度も見てません!\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度しか見てません!\n"
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr "警告: この鍵へは一つもメッセージを暗号化したことがありません!\n"
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr "警告: この鍵へは一つのメッセージしか暗号化したことがありません!\n"
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7065,19 -5546,15 +7065,19 @@@ msgstr[0] "
" %s\n"
"でダメとマークしてください。\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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "TOFUデータベースのオープンでエラー: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
"*警告*: %s に暗号化します。失効していないユーザIDが一つもないものです\n"
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr "鍵%s, ユーザID \"%s\"のポリシーの設定エラー: %s"
@@@ -7305,19 -5737,14 +7305,19 @@@ msgstr "
"形式: kbxutil [オプション] [ファイル]\n"
"Keyboxデータを一覧、エクスポート、インポート\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSAのモジュラスがないか、%dビットのものではありません\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA公開指数がないか %d ビットより大きすぎます\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PINコールバックがエラーを返しました: %s\n"
@@@ -7364,42 -5782,33 +7364,42 @@@ msgid "
msgstr ""
"|P|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "新しいPINの取得エラー: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "指紋の保管に失敗しました: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "生成日の保管に失敗しました: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "カードからCHVステイタスの取得でエラー\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "応答にRSAのモジュラスが含まれていません\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "応答にRSA公開指数が含まれていません\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
msgid "response does not contain the EC public key\n"
msgstr "応答に楕円曲線の公開鍵が含まれていません\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "応答に公開鍵データが含まれていません\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "公開鍵の読み込みに失敗しました: %s\n"
@@@ -7407,55 -5816,44 +7407,55 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr "%s番号 : %s%%0A保持者 : %s%%0Aカウンタ : %lu%s"
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr "%s番号 : %s%%0A保持者 : %s%s"
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr "残された試行回数: %d"
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "デフォルトPINを%sとして使います\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"デフォルトのPIN %s を使うのに失敗しました: %s - これ以上デフォルトとしての使"
"用を無効とします\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
msgid "||Please unlock the card"
msgstr "||カードをアンロックしてください"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%dのPINが短すぎます。最短で%dです\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%dの認証に失敗しました: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "カードが永久にロックされてます!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7464,23 -5862,18 +7464,23 @@@ msgstr[0] "カードの永久ロック�
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|管理者PINを入力してください"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "管理コマンドへのアクセスが設定されていません\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||PINを入力してください"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||カードのリセット・コードを入力してください"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "リセット・コードが短すぎます。最短の長さは%dです。\n"
@@@ -7488,106 -5881,82 +7488,106 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|新しいリセット・コード"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|新しい管理者PIN"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|新しいPIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||管理者PINと新しい管理者PINを入力してください"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||PINと新しいPINを入力してください"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "アプリケーション・データの読み込みエラー\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "フィンガープリントのデータ・オブジェクトの読み込みエラー\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "鍵はもうあります\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "既存の鍵は置き換えられます\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "新しい鍵を生成\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "新しい鍵を書き込み\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "作成時刻スタンプがありません\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA素数 %s がありません、または%dビットのものではありません\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "鍵の保管に失敗しました: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
msgid "unsupported curve\n"
msgstr "サポートされていない曲線\n"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "鍵生成の間、お待ちください ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "鍵の生成に失敗しました\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "鍵の生成が完了しました (%d秒)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "OpenPGPカードに無効な構造 (データ・オブジェクト 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "カードのフィンガープリントが要求されたものと一致しません\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "これまでに作成された署名: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "管理者PINの確認はこのコマンドでは今のところ禁止されています\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%sにアクセスできません - 無効なOpenPGPカード?\n"
@@@ -7607,11 -5973,9 +7607,11 @@@ msgstr "|N|初期の新しいPIN
msgid "run in multi server mode (foreground)"
msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FILE|FILEにログを書き出します"
@@@ -7665,12 -6018,10 +7665,12 @@@ msgstr "
"'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
"い\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %dのハンドラが開始されました\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %dのハンドラが終了しました\n"
@@@ -7741,9 -6077,6 +7741,9 @@@ msgstr "マッチする証明書の数
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "dirmngrのキャッシュだけの鍵探索に失敗しました: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "keyDBハンドルの確保に失敗しました\n"
@@@ -7918,7 -6211,6 +7918,7 @@@ msgstr "使用した検証モデル: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "%uビットハッシュは%uビットの%s鍵には無効です\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(これはMD2アルゴリズムです)\n"
@@@ -7961,7 -6246,6 +7961,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "鍵の使い方が指定されていません - すべての使い道を仮定します\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "鍵使用情報の取得エラー: %s\n"
@@@ -8216,11 -6447,9 +8216,11 @@@ msgstr "準備ができました。今�
msgid "resource problem: out of core\n"
msgstr "リソースの問題: メモリがありません\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(RC2アルゴリズムです)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(暗号化されたメッセージではないようです)\n"
@@@ -8249,127 -6473,96 +8249,127 @@@ msgstr "証明書'%s'を削除しまし
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "証明書'%s'の削除に失敗しました: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "有効な受け取り手が指定されていません\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "外部鍵を一覧する"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "証明書のチェインを表示する"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "証明書をインポートする"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "証明書をエクスポートする"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "スマートカードを登録する"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "dirmngrにコマンドを渡す"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "gpg-protect-toolを起動する"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "base-64形式の出力を作成"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "PEMフォーマットの入力を仮定する"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "base-64フォーマットの入力を仮定する"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "バイナリ・フォーマットの入力を仮定する"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "決してCRLを調べない"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "OCSPを用いて有効性を確認する"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|インクルードする証明書の数"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|ポリシー情報をFILEから取得する"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "証明書ポリシーをチェックしない"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "紛失している発行者証明書を取得する"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "端末をまったく使わない"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|サーバ・モードのログをFILEに書き出す"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|監査ログをFILEに書き出す"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "バッチ・モード: なにもユーザに問い合わせない"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "ほとんどの設問にyesを仮定する"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "ほとんどの設問にnoを仮定する"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|鍵リングを鍵リングのリストに追加"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|このキーサーバを鍵の検索に使う"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|暗号アルゴリズムにNAMEを使用"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|ダイジェスト・アルゴリズムにNAMEを使用"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "使い方: @GPGSM@ [オプション] [ファイル] (ヘルプは -h)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8379,46 -6572,37 +8379,46 @@@ msgstr "
"S/MIMEプロトコルを用いて、署名、検査、暗号化や復号を行います\n"
"デフォルトの操作は、入力データに依存します\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "*注意*:'%s'に対して暗号化できません: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "不明の検証モデル '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: ホスト名が指定されていません\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: ユーザなしに与えられたパスワード\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: この行はスキップ\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "共通証明書のインポート・エラー: %s\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "'%s'を用いて署名できません: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
@@@ -8479,7 -6651,6 +8479,7 @@@ msgstr "証明書の再検索の問題
msgid "error storing flags: %s\n"
msgstr "フラグの保存エラー: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "エラー - "
@@@ -8514,7 -6681,6 +8514,7 @@@ msgstr "
"\n"
"%s%s本当にこれを望みますか?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8533,51 -6698,41 +8533,51 @@@ msgstr "
"\"%s\"\n"
"注意してください: この証明書は署名を作るために作成されていません!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"ハッシュ・アルゴリズム %d (%s)(署名人 %d へ)はサポートされていません。%s を使"
"います\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "署名者 %dのために使われたハッシュアルゴリズム: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "適正な認定証明書の検査に失敗しました: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "施された署名 "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[日時指定なし]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " 証明書 ID 0x%08lXを用います\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"無効な署名: メッセージ・ダイジェストの属性が計算されたものと一致しません\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "正しい署名"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " 別名"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "これは認定署名です\n"
@@@ -9348,112 -7342,84 +9348,112 @@@ msgstr "絶対ファイル名がきま�
msgid "looking up '%s'\n"
msgstr "'%s'を検索します\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "CRLキャッシュの内容をリストします"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|FILEからCRLをキャッシュにロードする"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|URLからCRLを取得します"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "dirmngrをシャットダウンする"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "キャッシュをフラッシュします"
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "ユーザに問い合わせせずに実行"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "期日の過ぎたCRLのロードを強制する"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "OCSP要求の送信を認める"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr "オンラインのソフトウェア・バージョン・チェックを許す"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "HTTPの使用を禁止する"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "LDAPの使用を禁止する"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr "HTTP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr "LDAP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "OCSPサービスURLに入っている証明書を無視する"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "--ldap-proxy にフォールバック・ホストを使わない"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|LDAPのタイムアウトをN秒とする"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|OCSP応答としてURLを使用"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|FPRで署名されたOCSPレスポンス"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr "ネットワーク・トラフィックをすべてTor経由にする"
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9462,11 -7428,9 +9462,11 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9474,77 -7438,60 +9474,77 @@@ msgstr "
"形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有効なdebugレベルは: %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "使い方: %s [オプション] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "コロンはソケット名に許されません\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの取得の失敗: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの処理に失敗: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 行が長すぎます - スキップされました\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 読み込みエラー: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 行末のゴミを無視\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERMを受け取り - シャットダウン...\n"
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "強制的にシャットダウンする\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "シグナル%dを受け取り - アクションは定義されない\n"
@@@ -9714,7 -7625,14 +9714,18 @@@ msgstr "'%s'は、LDAP URLではあり�
msgid "'%s' is an invalid LDAP URL\n"
msgstr "'%s' は無効なLDAP URLです\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "'%s'へアクセスのエラー: httpステイタス %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "log出力エラー: %s\n"
@@@ -9779,12 -7685,10 +9790,12 @@@ msgstr "'%s:%d'をLDAPサーバ・リ�
msgid "malloc failed: %s\n"
msgstr "mallocが失敗しました: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: 無効なパターン '%s'\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search がサーバのサイズ限界を越えました\n"
@@@ -9844,12 -7736,6 +9855,7 @@@ msgstr "'%s'の接続エラー: %s\n
msgid "error reading HTTP response for '%s': %s\n"
msgstr "'%s'のHTTP応答の読み込みエラー: %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "'%s'へアクセスのエラー: httpステイタス %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "'%s'に対するOCSP応答構文解析エラー: %s\n"
@@@ -9963,76 -7825,60 +9969,76 @@@ msgstr "OSCPレスポンダは現在で
msgid "OCSP responder returned an too old status\n"
msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s)が失敗しました: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "ldapserverがありません"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "serialnoが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
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquireに失敗しました: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url が失敗しました: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "データ送信エラー: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch が失敗しました: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert が失敗しました: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d を越えました\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "制御構造を確保できません: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "assuanコンテクストの確保に失敗しました: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "サーバの初期化に失敗しました: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Assuanで登録コマンドに失敗しました: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept の問題: %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuanの処理が失敗しました: %s\n"
@@@ -10161,185 -7978,138 +10167,185 @@@ msgstr "行の送信に失敗しまし�
msgid "error sending standard options: %s\n"
msgstr "標準オプションを送信エラー: %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "診断出力を制御するオプション"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "コンフィグレーションを制御するオプション"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "デバッグのために有用なオプション"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "セキュリティを制御するオプション"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|N秒後にSSH鍵を無効とする"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|最大PINキャッシュ存続時間をN秒とする"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|最大SSH鍵存続時間をN秒とする"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "パスワード・ポリシーの強制オプション"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "パスワード・ポリシーを迂回することを認めない"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|新しいパスフレーズの必要とする最低長をNとする"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
"|N|新しいパスフレーズとしてアルファベットでないキャラクタを最低N必要とする"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|新しいパスフレーズをFILEのパターンに対してチェックする"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|N日後にパスフレーズを期限切れとする"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "古いパスフレーズを再使用することを認めない"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|PinentryのタイムアウトをN秒とする"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|デフォルトの秘密鍵としてNAMEを用いる"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|ユーザID NAMEにも暗号化する"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|電子メールエイリアスを設定する"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "キーサーバのコンフィグレーション"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|鍵サーバとしてURLを使用"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "PKA検索(DNS要求)を認める"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MECHANISMS|メールアドレスによって鍵を特定する際、MECHANISMSを使用する"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "dirmngrへのすべてのアクセスを無効とする"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|PKCS#12のパスフレーズにNAMEのエンコーディングを使う"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "ルート証明書のCRLをチェックしない"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "出力フォーマットを制御するオプション"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "インタラクティビティと強制を制御するオプション"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr "Torの使用を制御するオプション"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "HTTPサーバのコンフィグレーション"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "システムのHTTPプロキシ設定を用います"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "使用するLDAPサーバのコンフィグレーション"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "LDAPサーバ・リスト"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "OCSPのコンフィグレーション"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr "プライベート鍵"
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr "スマートカード"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr "ネットワーク"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
msgid "Passphrase Entry"
msgstr "パスフレーズ入力"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "コンポーネントが起動するために適切ではありません"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "コンポーネント%sの外部の検証が失敗しました"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "グループ仕様は無視されていることに注意してください\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, c-format
msgid "error closing '%s'\n"
msgstr "'%s'でクローズのエラー\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, c-format
msgid "error parsing '%s'\n"
msgstr "'%s'でパーズのエラー\n"
@@@ -10408,11 -8162,9 +10414,11 @@@ msgstr "出力ファイルとして使�
msgid "activate changes at runtime, if possible"
msgstr "可能な場合、実行時に変更を有効とする"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "使い方: @GPGCONF@ [オプション] (ヘルプは -h)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10420,15 -8172,12 +10426,15 @@@ msgstr "
"形式: @GPGCONF@ [オプション]\n"
"@GNUPG@システムのツールに対しコンフィグレーション・オプションを管理する\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "一つコンポーネント引数が必要です"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "コンポーネントが見つかりません"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "引数は許可されていません"
diff --cc po/nb.po
index eca86ae,09e8fc2..1c66f23
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -23,7 -22,6 +23,7 @@@
"X-Generator: Poedit 1.5.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
@@@ -34,45 -32,35 +34,45 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|_Avbryt"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr "|pinentry-label|_Ja"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr "|pinentry-label|_Nei"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr "|pinentry-label|_Lagre i passordbehandler"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Er du sikker på at du vil gjøre passordfrasen synlig på skjermen?"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr "|pinentry-tt|Gjør passordfrase synlig"
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
msgid "|pinentry-tt|Hide passphrase"
msgstr "|pinentry-tt|Skjul passordfrase"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Kvalitet:"
@@@ -82,20 -70,17 +82,20 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
"hvordan kvaliteten vurderes."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
"Skriv inn PIN-kode slik at hemmelig nøkkel kan låses opp for denne økta"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -103,53 -88,40 +103,53 @@@ msgstr "
"Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
"gjeldende økt"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Passordfrase:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "feil. Prøv igjen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (forsøk %d av %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "Gjenta:"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "For lang PIN"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "For lang passordfrase"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Ugyldig tegn i PIN"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "Koden er for kort"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Ugyldig PIN"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Ugyldig passordfrase"
@@@ -158,57 -129,35 +158,57 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "klarte ikke å lage «%s»: %s\n"
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "klarte ikke å åpne «%s»: %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "oppdaget kort med serienummer %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "fant ingen passende kortnøkkel: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Tillat"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Avvis"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Skriv inn denne passordfrasen på nytt"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -243,63 -187,49 +243,63 @@@ 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:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "klarte ikke å lage strøm av sokkel: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Sett inn kort med serienummer"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Fjern gjeldende kort og sett inn kort med serienummer"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Admin-PIN"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Tilbakestillingskode"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0ABruk leserens kodeplate til å skrive."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Gjenta tilbakestillingskode"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Gjenta PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Gjenta PIN"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Tilbakestillingskode ble ikke gjentatt korrekt. Prøv igjen"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK-kode ble ikke gjentatt korrekt. Prøv igjen"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Skriv inn PIN-kode%s%s%s for å låse opp kort"
@@@ -375,8 -292,6 +375,8 @@@ msgstr "Skriv inn passordfrase for å%0
msgid "Please enter the new passphrase"
msgstr "Skriv inn ny passordfrase"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -384,134 -299,98 +384,138 @@@ msgstr "
"@Valg:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "kjør som bakgrunnsprosess («daemon»)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "kjør i tjenermodus (forgrunn)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "kjør i tjenermodus"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detaljert utskrift"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "være noenlunde stille"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "sh-utdata for kommandoer"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "csh-utdata for kommandoer"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FIL|les valg fra valgt FIL"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "ikke løsne fra konsoll"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "ikke bruk tastatur og mus"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "bruk loggfil for tjeneren"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|bruk PGN som SCdaemon-program"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "ikke bruk SCdaemon"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|godta enkelte kommandoer via «NAME»"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ignorer forespørsler om å bytte TTY"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ignorer forespørsler om å bytte X-skjerm"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "ikke bruk PIN-hurtiglager under signering"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "disallow the use of an external password cache"
msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "ikke la klienter tillitsmarkere nøkler"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "tillat valg av passordfrase på forhånd"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr "ikke la kaller overstyre PIN-inntasting"
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr "la brukeren skrive inn passordfrase via Emacs"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "slå på ssh-støtte"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter programfeil til <@EMAIL@>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -519,143 -398,109 +523,148 @@@ 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:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "valg kontrollsum-algoritme er ugyldig\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "leser valg fra «%s»\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Merk: «%s» regnes ikke som et valg\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "klarte ikke å lage sokkel: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "sokkelnavnet «%s» er for langt\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "en gpg-agent kjører allerede. Lar være å starte en ny\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "feil under henting av sokkel-anledning\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "feil under knytning av sokkel til «%s»: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() mislyktes: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat() mislyktes for «%s»: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "«%s» kan ikke brukes som hjemmemappe\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "feil under lesing av anledning på fd %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "startet behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "avsluttet behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "startet ssh-behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "avsluttet ssh-behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect mislyktes: %s - venter 1s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Bruk: gpg-preset-passphrase [valg] NØKKELGREP («-h» for hjelp)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -663,8 -508,6 +672,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
"Vedlikehold av hurtiglager for passord\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -672,9 -515,6 +681,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -728,8 -560,6 +737,8 @@@ msgstr "avbrutt\n
msgid "error while asking for the passphrase: %s\n"
msgstr "feil under spørring etter passordfrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "feil under åpning av «%s»: %s\n"
@@@ -789,8 -610,6 +798,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Nei"
@@@ -843,7 -655,6 +852,7 @@@ msgstr "Endre passordfrase
msgid "I'll change it later"
msgstr "Jeg endrer senere"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -851,11 -662,9 +860,11 @@@
msgstr ""
"Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "Slett nøkkel"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -878,7 -684,6 +887,7 @@@ msgstr "%s nøkkel bruker utrygg kontro
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "kontrollsum på %zu bit er ugyldig for %u-bits %s-nøkler\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "kontroll av opprettet signatur mislyktes: %s\n"
@@@ -916,8 -711,6 +925,8 @@@ msgstr "feil under opprettelse av datar
msgid "error creating a stream for a pipe: %s\n"
msgstr "feil under opprettelse av strøm for datarør: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "feil under kopiering av prosess: %s\n"
@@@ -1045,7 -812,6 +1054,7 @@@ msgstr "kjernen i sikkert minne ble ful
msgid "out of core while allocating %lu bytes"
msgstr "kjernen ble full under tildeling av %lu byte"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "feil under tildeling av minne: %s\n"
@@@ -1060,7 -824,6 +1069,7 @@@ msgstr "%s:%u: valget «%s» er utgått
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ADVARSEL: valget «%s%s» er utgått, og har ingen effekt\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "unknown debug flag '%s' ignored\n"
@@@ -1164,8 -904,6 +1173,8 @@@ msgstr "Øktnøkkel opprettet
msgid "algorithm: %s"
msgstr "algoritme: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "ustøttet algoritme: %s"
@@@ -1331,7 -1031,6 +1340,7 @@@ msgstr "ugyldig valg
msgid "missing argument for option \"%.50s\"\n"
msgstr "valget «%.50s» mangler et argument\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "ugyldig argument for valget «%.50s»\n"
@@@ -1356,7 -1051,6 +1365,7 @@@ msgstr "valget «%.50s» er flertydig\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommandoen «%.50s» er flertydig\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "kjernen er full\n"
@@@ -1414,8 -1097,6 +1423,8 @@@ msgstr "lås «%s» ikke opprettet: %s\
msgid "waiting for lock %s...\n"
msgstr "venter på lås %s …\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s er for gammel (krever %s, har %s)\n"
@@@ -1536,7 -1191,6 +1545,7 @@@ msgstr "notatnavn skal bare inneholde u
msgid "WARNING: invalid notation data found\n"
msgstr "ADVARSEL: fant ugyldig notatdata\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "klarte ikke å videresende %s forespørsel til klient\n"
@@@ -1545,33 -1198,31 +1554,40 @@@
msgid "Enter passphrase: "
msgstr "Skriv inn passordfrase: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, c-format
msgid "error getting version from '%s': %s\n"
msgstr "feil under henting av versjon fra «%s»: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr "tjener «%s» er eldre enn oss (%s < %s)"
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, c-format
msgid "WARNING: %s\n"
msgstr "ADVARSEL: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s virker ikke enda med %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Oppdaget OpenPGP-kortnummer %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "du kan ikke gjøres dette i buntmodus\n"
@@@ -1579,14 -1229,9 +1595,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Tilbakestillingskode er ikke tilgjengelig\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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Ditt valg? "
@@@ -1643,90 -1275,55 +1659,75 @@@ msgstr "Feil: Det kombinerte navnet er
msgid "URL to retrieve public key: "
msgstr "Adresse for henting av offentlig nøkkel: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Feil: Adressen er for lang (grensa er %d tegn).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
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:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "feil under skriving av «%s»: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Logindata (kontonavn): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Feil: Logindata er for langt (grensa går ved %d tegn).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Privat DO-data: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Feil: Privat DO for lang (grensa går ved %d tegn).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Språkoppsett: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Kjønn ((M)askulint, (F)eminint eller mellomrom): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Feil: ugyldig svar.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "CA-fingeravtrykk: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Feil: feilformatert fingeravtrykk.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "feil under henting av nøkkelinfo: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Erstatte eksisterende nøkkel? (j/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1736,55 -1333,43 +1737,55 @@@ msgstr "
" Se dokumentasjon for kortet du bruker og finn ut hvilke størrelser \n"
" det tillater hvis nøkkelgenerering mislykkes.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Hvor stor skal signaturnøkkelen være? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Hvor stor skal krypteringsnøkkelen være? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Hvor stor skal autentiseringsnøkkelen være? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rundet opp til %u bit\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nøkkelstørrelser må ligge i rekkevidden %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "feil under endring av størrelse på nøkkel %d til %u bit: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "MERK: det ligger allerede nøkler på kortet.\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Erstatte eksisterende nøkler? (j/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1795,161 -1380,117 +1796,161 @@@ msgstr "
" PIN = «%s» Admin-PIN = «%s»\n"
"Du bør endre disse med kommandoen «--change-pin»\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Velg hvilken type nøkkel du vil lage:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Signaturnøkkel\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsnøkkel\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnøkkel\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Ugyldig valg.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "velg hvor nøkkelen skal lagres:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "KEYTOCARD mislyktes: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
msgid "This command is not supported by this card\n"
msgstr "Denne kommandoen støttes ikke av dette kortet\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Merk: denne kommandoen ødelegger alle nøkler på kortet.\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
msgid "Continue? (y/N) "
msgstr "Vil du fortsette? (j/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "gå ut av denne menyen"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "vis admin-kommandoer"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "vis denne hjelpeteksten"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "vis alle tilgjengelige data"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "endre kortholders navn"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "endre adresse for å hente nøkkel"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "hent nøkkel som ligger i kortets adresse"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "endre brukernavn"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "endre språkoppsett"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "endre kortholders kjønn"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "endre CA-fingeravtrykk"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "slå av på tvungen bruk av signatur-PIN"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "lag nye nøkler"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "meny for å endre eller fjerne blokkering av PIN"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "bekrefte PIN og vise alle data"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "fjern PIN-blokkering med en tilbakestillingskode"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr "ødelegg alle nøkler og data"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/kort> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Admin-reservert kommando\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Admin-kommandoer er tillatt\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Admin-kommandoer er ikke tillatt\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (prøv «help»)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "«--output» virker ikke med denne kommandoen\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "feil under lesing av nøkkelblokk: %s\n"
@@@ -2007,36 -1536,29 +2008,36 @@@ msgstr "det finnes en hemmelig nøkkel
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "bruk valget «--delete-secret-keys» for å slette den først.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "feil under opprettelse av passordfrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "klarte ikke å bruke symmetrisk ESK-pakke på grunn av S2K-modus\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "bruker krypteringsmetode %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "«%s» er allerede komprimert\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "ADVARSEL: «%s» er en tom fil\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "leser fra «%s»\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2044,7 -1566,16 +2045,20 @@@ msgstr "
"ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
"mottakers oppsett\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "du kan ikke bruke krypteringsalgoritme «%s» i %s-modus\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "ADVARSEL: valget «%s%s» er utgått, og har ingen effekt\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2053,39 -1584,33 +2067,40 @@@ msgstr "
"ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
"mottakers oppsett\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "tvungen bruk av krypt.metode %s (%d) bryter med mottakers oppsett\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kryptert 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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "du kan ikke bruke «%s» i «%s»-modus\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterte data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kryptert med en ukjent algoritme %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ADVARSEL: meldinga ble kryptert med svak nøkkel for symmetrisk "
"krypteringsmetode.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problem ved håndtering av kryptert pakke\n"
@@@ -2167,36 -1675,27 +2182,36 @@@ msgstr "fjern så mye som mulig fra nø
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
msgstr ". Hoppet over"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "skriver til «%s»\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nøkkel %s: nøkkelmateriell på kort - hoppet over\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "nøkkel %s: PGP 2.x-aktig nøkkel - hoppet over\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: ingenting eksportert\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2260,215 -1746,168 +2275,221 @@@ msgstr "bruker «%s» som forvalgt hemm
msgid "all values passed to '%s' ignored\n"
msgstr "alle verdier som sendes til «%s» blir ignorert\n"
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "lag signatur"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "lag klartekst-signatur"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "lag adskilt signatur"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "krypter data (symmetrisk)"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "dekrypter data (forvalgt)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "bekreft signatur"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "vis nøkler"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "vis nøkler og signaturer"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "vis og kontroller nøkkelsignaturer"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "vis nøkler og fingeravtrykk"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "vis hemmelige nøkler"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "lag nytt nøkkelpar"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "lag nytt nøkkelpar raskt"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
msgid "quickly add a new user-id"
msgstr "legg til en ny bruker-ID raskt"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly revoke a user-id"
msgstr "opphev bruker-ID raskt"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "lag nytt nøkkelpar raskt"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "fullverdig generering av nøkkelpar"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "lag opphevelsessertifikat"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "fjern nøkler fra offentlig nøkkelknippe"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "fjern nøkler fra hemmelig nøkkelknippe"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "hurtigsigner nøkkel"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "hurtigsigner nøkkel lokalt"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "signer nøkkel"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "signer nøkkel lokalt"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "signer eller rediger nøkkel"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "endre passordfrase"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "eksporter nøkler"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "eksporter nøkler til nøkkeltjener"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importer nøkler fra nøkkeltjener"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "søk etter nøkler på nøkkeltjener"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "oppdater alle nøkler fra nøkkeltjener"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importer/slå sammen nøkler"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "vis kortstatus"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "endre data på kort"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "endre PIN på kort"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "oppdater tillitsdatabase"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "skriv ut kontrollsum av melding"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "kjør i tjenermodus"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VERDI|endre TOFU-regler for nøkkel"
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "lag ASCII-beskyttet utdata"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv utdata til valgt FIL"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ikke utfør valgte endringer"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "spør før overskriving"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "bruk streng OpenPGP-oppførsel"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2476,7 -1915,6 +2497,7 @@@ msgstr "
"@\n"
"(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2506,11 -1944,9 +2527,11 @@@ msgstr "
" --list-keys [navn] vis nøkler\n"
" --fingerprint [navn] vis fingeravtrykk\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2520,7 -1956,6 +2541,7 @@@ msgstr "
"Signer, kontroller, krypter eller dekrypter.\n"
"Forvalgt handling avhenger av inndata.\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2528,530 -1963,401 +2549,514 @@@ msgstr "
"\n"
"Støttede algoritmer:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Off. nøkkel: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Kryptering: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "bruk: %s [valg] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "oppsettselementet «%s» er ukjent\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "vis foto-id-er i nøkkelvisning"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "vis regeladresser i signaturvisning"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "vis alle notater i signaturvisning"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotater under signaturvisning"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "vis brukervalgte notater under signaturvisning"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
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:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "vis nøkkelknippe-navn i nøkkelvisning"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "vis utløpsdatoer i nøkkelvisning"
- #: 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:2069
++#: g10/gpg.c:2074
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "«%s» er et ukjent TOFU-regelverk\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr "(bruk «help» for å vise valg)\n"
- #: 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:2244
++#: g10/gpg.c:2227
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» er en ugyldig signatur-utløpstid\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» er ikke et gyldig tegnsett\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importeringsvalg\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "ugyldige importeringsvalg\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, c-format
msgid "invalid filter option: %s\n"
msgstr "filtervalget %s er ugyldig\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "vis bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "vis adresser til retningslinjer under signaturbekreftelse"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "vis alle merknader under signaturbekreftelse"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotater under signaturbekreftelse"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "vis selvvalgte merknader under signaturbekreftelse"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "kontroller signaturer som har PKA-data"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige kontrollvalg\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "ugyldige kontrollvalg\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "klarte ikke å endre «exec»-sti til %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "du kan ikke bruke %s med %s.\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s gir ikke mening med %s.\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kjører med falsk systemtid: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "«completes-needed» må være større enn 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "«marginals-needed» må være større enn 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "ugyldig standardoppsett\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enda med %s\n"
- #: 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:3863
- #, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+ #, fuzzy, c-format
+ #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "du kan ikke bruke summeringsalgoritme «%s» i %s-modus\n"
- #: g10/gpg.c:3868
- #, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+ #, fuzzy, c-format
+ #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "du kan ikke bruke komprimeringsalgoritme «%s» i «%s»-modus\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "du kan ikke velge «--symmtric» og «--encrypt» i «%s»-modus\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "du kan ikke velge «--symmtric», «--sign» og «--encrypt» i «%s»-modus\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "nøkkeleksport mislyktes: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "søk på nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "«%s» er en ugyldig summeringsalgoritme\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, 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:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Skriv inn melding …\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "valgt adresse for signaturregler er ugyldig\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@@ -3063,7 -2367,6 +3068,7 @@@ msgstr "|FIL|hent nøkler fra valgt nø
msgid "make timestamp conflicts only a warning"
msgstr "la konflikter mellom tidsstempler bare være en advarsel"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|skrive statusinfo til denne FD"
@@@ -3092,139 -2390,115 +3097,145 @@@ msgstr "Ingen hjelp tilgjengelig
msgid "No help available for '%s'"
msgstr "Ingen hjelp tilgjengelig for «%s»"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "importer signaturer som er merket som kun lokale"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "reparer skader fra pks-nøkkeltjener under importering"
- #: g10/import.c:158
++#: g10/import.c:166
msgid "do not clear the ownertrust values during import"
msgstr "ikke tøm «ownertrust»-verdier under importering"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "ikke oppdater tillitsdatabase etter importering"
- #: g10/import.c:164
++#: g10/import.c:172
msgid "show key during import"
msgstr "vis nøkkel under importering"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "bare godta oppdateringer av nøkler som finnes allerede"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "fjern ubrukelige deler av nøkkel etter importering"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "fjern så mye som mulig fra nøkkel etter importering"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr "kjør importeringsfiltre og eksporter nøkkel umiddelbart"
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "forvent inndata i binærformat"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key during import"
+ msgid "repair keys on import"
+ msgstr "vis nøkkel under importering"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "hopper over blokk av typen %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu nøkler behandlet hittil\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antall behandlet: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " hopper over PGP 2-nøkler: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nye nøkler som ble hoppet over: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " uten bruker-id-er: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importert: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " uendret: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruker-id-er: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undernøkler: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye signaturer: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye nøkkelopphevinger: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " leste hemmelige nøkler: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerte hemmelige nøkler: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " uforandrede hemmelige nøkler: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importert: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " oppryddete signaturer: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " tømte bruker-id-er: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3233,190 -2507,152 +3244,190 @@@ msgstr "
"ADVARSEL: nøkkelen %s inneholder innstillinger for\n"
"utilgjengelige algoritmer på følgende bruker-id-er:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " «%s»: innstilling for krypteringsalgoritme %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " «%s»: oppsett for kontrollsum-algoritme %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " «%s»: oppsett av komprimeringsalgoritme %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "du anbefales på det sterkeste å endre oppsett og\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"dele ut denne nøkkelen på nytt for å unngå potensielle problemer med "
"algoritme-samsvar\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "nøkkel %s: ingen bruker-ID\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "nøkkel %s: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "avvist av importeringskontrollør"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nøkkel %s: PKS-undernøkkel reparert\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nøkkel %s: akseptert ikke-selvsignert bruker-ID «%s»\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nøkkel %s: ingen gyldig bruker-id-er\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes manglende selvsignatur\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nøkkel %s: fant ikke offentlig nøkkel: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nøkkel %s: ny nøkkel. Hoppet over\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "fant ikke skrivbart nøkkelknippe: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nøkkel %s: offentlig nøkkel «%s» importert\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nøkkel %s: «%s» 1 ny signatur\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nøkkel %s: «%s» 1 ny undernøkkel\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nøkkel %s: «%s» %d nye undernøkler\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nøkkel %s: «%s» ikke endret\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nøkkel %s: hemmelig nøkkel importert\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "nøkkel %s: feil under sending til agent: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "hemmelig nøkkel %s: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3432,141 -2668,114 +3443,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Kjør følgende kommando for å flytte «%s»: %s\n"
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"nøkkel %s: offentlig nøkkel mangler. Klarte ikke å bruke "
"opphevelsessertifikat\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nøkkel %s: offentlig nøkkelalgoritme for bruker-ID («%s») støttes ikke\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nøkkel %s: ugyldig selvsignatur for bruker-ID «%s»\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nøkkel %s: ingen undernøkkel for nøkkelbinding\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nøkkel %s: ingen undernøkkel for nøkkeloppheving\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nøkkel %s: hoppet over undernøkkel\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "nøkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "nøkkel %s: opphevingssertifikat på feil plass - hoppet over\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "nøkkel %s: undernøkkelsignatur på feil plass - hoppet over\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nøkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: nøkkel %s kan være opphevet: henter opphevingsnøkkel %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
@@@ -3606,82 -2808,12 +3617,15 @@@ msgstr "feil under åpning av nøkkelda
msgid "failed to rebuild keyring cache: %s\n"
msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[oppheving]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[selvsignatur]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr ""
- "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
- "offentlig nøkkel (%d): %s.\n"
-
- #: g10/keyedit.c:642
- #, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr ""
- "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
- "meldingssum (%d): %s.\n"
-
- #: g10/keyedit.c:805
- msgid " (reordered signatures follow)"
- msgstr " (omsorterte signaturer følger)"
-
- #: g10/keyedit.c:918
- #, c-format
- msgid "key %s:\n"
- msgstr "nøkkel %s:\n"
-
- #: g10/keyedit.c:921
- #, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "%d duplikatsignatur fjernet\n"
- msgstr[1] "%d duplikatsignaturer fjernet\n"
-
- #: g10/keyedit.c: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 signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
- msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, c-format
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d ubrukelig signatur\n"
- msgstr[1] "%d ubrukelige signaturer\n"
-
- #: g10/keyedit.c:932
- #, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "%d signatur omsortert\n"
- msgstr[1] "%d signaturer omsortert\n"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
- "Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
- "kontrollere alle signaturer.\n"
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3692,17 -2824,14 +3636,17 @@@ msgstr "
"andre brukeres nøkler (ved å se på pass, sjekke fingeravtrykk fra\n"
"forskjellige kilder, osv.)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jeg stoler marginalt\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jeg stoler fullt\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3712,52 -2841,40 +3656,52 @@@ msgstr "
"En dybde på over 1 tillater at nøkkelen du signerer\n"
"lager tillitssignaturer på dine vegne.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Skriv inn et domene som denne signaturen skal begrenses til, eller trykk "
"enter hvis ingen.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "Hopper over bruker-ID «%s», som ikke er en tekst-iD.\n"
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Bruker-ID «%s» er opphevet."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Er du sikker på at du vil signerere den? (j/N) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Klarte ikke å signere.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Bruker-ID «%s» er utgått."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Bruker-ID «%s» er ikke selvsignert."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Bruker-ID «%s» er signerbar. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Signere den? (j/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3766,11 -2883,9 +3710,11 @@@ msgstr "
"Selvsignaturen på «%s»\n"
"er en PGP 2.x-aktig signatur.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3779,11 -2894,9 +3723,11 @@@ msgstr "
"Gjeldende signatur på «%s»\n"
"er utgått.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Vil du utstede en ny signatur for å erstatte den som er utgått? (j/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3792,43 -2905,34 +3736,43 @@@ msgstr "
"Din nåværede signatur på «%s»\n"
"er en lokal signatur.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "«%s» var allerede lokalt signert med nøkkelen %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "«%s» var allerede signert med nøkkelen %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Vil du signere den på nytt likevel? (j/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Ingenting å signere med nøkkelen %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Denne nøkkelen er utgått."
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denne nøkkelen utgår %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Vil du at signaturen skal utgå på samme tidspunkt? (J/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3838,31 -2942,25 +3782,31 @@@ msgstr "
"tilhører den overnevnte personen? Skriv «0» hvis du ikke vet\n"
"svaret.\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jeg har ikke sjekket i det hele tatt.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jeg har gjort en vanlig sjekk.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Jeg har sjekket veldig nøye.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "Hva velger du? (skriv «?» for mer informasjon): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3871,224 -2969,170 +3815,224 @@@ msgstr "
"Er du sikker på at du vil signerere denne nøkkelen med\n"
"nøkkelen «%s» (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Dette skal være en selvsignatur.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "ADVARSEL: signaturen blir ikke markert som ikke-eksporterbar.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "ADVARSEL: signaturen blir ikke markert som ikke-opphevbar.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Signaturen blir markert som ikke-eksporterbar.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Signaturen blir markert som ikke-opphevbar.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Jeg har ikke sjekket denne nøkkelen i det hele tatt.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Jeg har sjekket denne nøkkelen på vanlig måte.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Jeg har sjekket denne nøkkelen veldig nøye.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Er du sikker på at du vil signere? (j/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Nøkkelen har bare stubbe- eller kortnøkkel-elementer. Ingen passordfrase å "
"endre.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "nøkkel %s: feil under endring av passordfrase: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "lagre og avslutte"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "vise nøkkelens fingeravtrykk"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
msgid "show the keygrip"
msgstr "vis nøkkelgrep"
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "vis nøkler og bruker-id-er"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "velger bruker-ID N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "velger bruker-ID N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "sjekke signaturer"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr "signer valgte bruker-id-er [* se nedenfor for relevante kommandoer]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "signerer valgte bruker-id-er lokalt"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "signer valgte bruker-id-er med tillitssignatur"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"signer valgte bruker-id-er med en signatur som ikke kan trekkes tilbake"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "legg til bruker-ID"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "legg til foto-ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "slett valgte bruker-id-er"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "legg til undernøkkel"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "legg til nøkkel på et smartkort"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "flytt nøkkel til et smartkort"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "flytt en sikkerhetskopi-nøkkel til et smartkort"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "slett valgte undernøkler"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "legg til opphevingsnøkkel"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "slett signaturer fra valgte bruker-id-er"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "endre utløpsdato for nøkkelen eller valgte undernøkler"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "marker valgt bruker-ID som primær"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "vis innstillinger (avansert)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "vis innstillinger (detaljert)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "velg oppsettsliste for valgte bruker-id-er"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "endre adresse til foretrukket nøkkeltjener for valgte bruker-id-er"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "endre notat for valgte bruker-id-er"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "endre passordfrase"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "endre eiertillit"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "opphev signaturer på valgte bruker-id-er"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "opphev valgte bruker-id-er"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "opphev nøkkel eller valgte undernøkler"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "ta nøkkel i bruk"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "ta nøkkel ut av bruk"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "vis valgte foto-id-er"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"pakkk sammen ubrukelige bruker-id-er og fjern ubrukelige signaturer fra "
"nøkkel"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"pakkk sammen ubrukelige bruker-id-er og fjern alle signaturer fra nøkkel"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Hemmelig nøkkel er tilgjengelig.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Du trenger tilhørende hemmelig nøkkel for å gjøre dette.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4102,275 -3146,223 +4046,287 @@@ msgstr "
" (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
"osv.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Nøkkelen er opphevet."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Er du sikekr på at du vil signerere alle bruker-id-er? (j/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
msgid "Really sign all text user IDs? (y/N) "
msgstr "Er du sikker på at du vil signerere alle bruker-id-er? (j/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: Velg bruker-id-en(e) du vil signere\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "«%s» er en ukjent signaturtype\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Du må velge minst én bruker-ID.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Bruk kommandoen «%s».)\n"
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Du kan ikke slette siste bruker-ID.\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Er du sikker på at du vil fjerne alle valgte bruker-id-er? (j/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Er du sikker på at du vil fjerne valgt bruker-ID? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Er du sikker på at du vil flytte primærnøkkelen? (j/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Du må velge minst én nøkkel.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Kommandoen forventer et filnavn-argument\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Klarte ikke å åpne «%s»: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Feil under lesing av sikkerhetskopi-nøkkel fra «%s»: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Du må velge minst én nøkkel.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Er du sikker på at du vil slette valgt nøkkel? (j/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Er du sikker på at du vil slette denne nøkkelen? (j/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Er du sikker på at du vil oppheve alle valgte bruker-id-er? (j/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Er du sikker på at du vil oppheve denne bruker-id-en? (j/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Er du sikker på at du vil oppheve hele nøkkelen? (j/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Er du sikker på at du vil oppheve valgte undernøkler? (j/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Er du sikker på at du vil oppheve denne undernøkkelen? (j/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Du kan ikke justere eiertillit når du bruker selvvalgt tillitsdatabase\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Bytt oppsettsliste til:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Er du sikker på at du vil oppdatere oppsett for valgte bruker-id-er? (j/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Er du sikker på at du vil oppdatere oppsett? (j/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Vil du lagre endringer? (j/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Vil du avslutte uten å lagre? (j/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Du kan ikke slette siste bruker-ID.\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "kontroll av tillitsliste mislyktes: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "kontroll av tillitsliste mislyktes: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "«%s» er ikke et fingeravtrykk\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "«%s» er ikke primært fingeravtrykk\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "Bruker-ID «%s» er ugyldig: %s\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "Ingen treff på bruker-id-er."
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "Ingenting å signere.\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "'%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "«%s» er en ugyldig signatur-utløpstid\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "\"%s\" is not a fingerprint\n"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "«%s» er ikke et fingeravtrykk\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "fant ikke nøkkelen «%s»\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Kontrollsum: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Funksjoner: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Nøkkeltjener no-modify"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Foretrukket nøkkeltjener: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Notasjoner: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x-brukere har ingen oppsettsmuligheter.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Følgende nøkkel ble opphevet %s av %s med nøkkelen %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Denne nøkkelen kan bli opphevet av %s med nøkkelen %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "opprettet: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "opphevet: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "utgikk: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "utgår: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "bruk: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "kortnr.: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "gyldighet: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Denne nøkkelen er ikke i bruk"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4378,18 -3370,12 +4334,18 @@@ msgstr "
"Merk: du bør starte programmet på nytt for å sikre at nøkkel-gyldigheten\n"
"som vises her er riktig.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "utgått"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4397,15 -3383,12 +4353,15 @@@ msgstr "
"ADVARSEL: ingen bruker-ID er merket som primær. Denne kommandoen kan\n"
" føre til at en annen bruker-ID blir brukt som primærbruker.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4415,72 -3398,57 +4371,72 @@@ msgstr "
"føre til at\n"
" enkelte PGP-versjoner avviser nøkkelen.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Er du sikker på at du vil legge den til? (j/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du kan ikke knytte foto-ID til PGP2-nøkler.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Slette denne gode signaturen? (j/N/a)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "Slettet %d signatur.\n"
msgstr[1] "Slettet %d signaturer.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Ingen ble slettet.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Bruker-ID «%s» pakket sammen: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Bruker-ID «%s»: %d signatur fjernet\n"
msgstr[1] "Bruker-ID «%s»: %d signaturer fjernet\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Bruker-ID «%s»: allerede minimert\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Bruker-ID «%s»: allerede renset\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4490,209 -3458,169 +4446,215 @@@ msgstr "
" kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
"nøkkelen.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Du kan ikke knytte opphevere til PGP 2.x-nøkler.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Skriv inn oppheverens bruker-ID: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "du kan ikke bruke PGP 2.x-nøkler som opphevere\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "du kan ikke bruke en nøkkel som opphevelsesnøkkel for seg selv\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "denne nøkkelen er allerede i bruk som opphevelsesnøkkel\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"ADVARSEL: du kan ikke angre tildeling av opphevelsesrolle til en nøkkel.\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Er du sikker på at du vil gjøre denne nøkkelen til en opphever? (j/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr ""
"Er du sikker på at du vil endre utløpstid for flere undernøkler? (j/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Endrer utløpstid for undernøkkel.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Endrer utløpstid for primærnøkkel.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Du kan ikke endre utløpsdato for v3-nøkler\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"undernøkkel %s signerer ikke, og behøver derfor ikke å bli kryssertifisert\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Velg én bruker-ID.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Er du sikker på at du vil erstatte den? (j/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Er du sikker på at du vil slette den? (j/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Skriv inn notat: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Vil du fortsette? (j/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruker-ID med indeks %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen bruker-ID med kontrollsum %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Ingen undernøkkel med ID «%s».\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernøkkel med indeks %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "bruker-ID: «%s»\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "signert med nøkkelen %s %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (ikke-eksporterbar)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne signaturen utgikk %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Er du sikker på at du vil oppheve den? (j/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Ikke signert av deg.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Du har signert disse bruker-id-ene med nøkkelen %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (kan ikke oppheves)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "opphevet med nøkkelen %s %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "ingen hemmelig nøkkel\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr "prøvde å oppheve ID som ikke tilhørte en bruker: %s\n"
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "bruker-ID «%s» er allerede opphevet\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "ADVARSEL: en bruker-id-signatur er datert %d sekunder i fremtiden\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Du kan ikke slette siste bruker-ID.\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nøkkelen %s er allerede opphevet.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernøkkel %s er allerede opphevet.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Viser %s foto-ID av størrelsen %ld for nøkkel %s (uid %d)\n"
++#: g10/keygen.c: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/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "innstilling «%s» er duplisert\n"
@@@ -5126,8 -3977,6 +5088,8 @@@ msgstr "
"diskene jobbe) mens dette pågår. Da får\n"
"tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nøkkelgenerering mislyktes: %s\n"
@@@ -5199,7 -4035,6 +5161,7 @@@ msgstr "feil under skriving av offentli
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5208,7 -4043,6 +5170,7 @@@ msgstr "
"vurdere å bruke kommandoen «--edit-key» for å lage en\n"
"undernøkkel til dette formålet.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5216,7 -4050,6 +5178,7 @@@ msgstr "
"nøkkel har blitt opprettet %lu sekund i fremtiden (time warp- eller "
"klokkeproblem)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5224,95 -4057,87 +5186,109 @@@ msgstr "
"nøkkel har blitt opprettet %lu sekunder i fremtiden (time warp- eller "
"klokkeproblem)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"Merk: det strider med OpenPGP-standarden å lage undernøkler for v3-nøkler\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemmelige deler av primærnøkkelen er lagret på kort.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Er du sikker på at du vil fortsette? (j/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "aldri "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Regler for kritisk signatur: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Regler for signatur: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Kritisk foretrukket nøkkeltjener: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kritisk signaturnotat: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Signaturnotat: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "%d gyldig signatur\n"
msgstr[1] "%d gyldige signaturer\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, c-format
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d ubrukelig signatur\n"
+ msgstr[1] "%d ubrukelige signaturer\n"
+
++#: g10/keylist.c:482
+ #, c-format
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
+ msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
+
++#: g10/keylist.c:487
#, 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 signatur ble ikke kontrollert på grunn av feil\n"
msgstr[1] "%d signaturer ble ikke kontrollert på grunn av feil\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] "Advarsel: hoppet over %lu nøkkel pga. for høy størrelse\n"
msgstr[1] "Advarsel: hoppet over %lu nøkler pga. for høy størrelse\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Nøkkelknippe"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Fingeravtrykk for primærnøkkel:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Fingeravtrykk for undernøkkel:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Fingeravtrykk for primærnøkkel:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Fingeravstrykk for undernøkkel:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Nøkkelfingeravtrykk ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
@@@ -5418,256 -4222,208 +5394,263 @@@ msgstr "fant ikke nøkkelen på nøkkel
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen kjent nøkkeltjener (bruk valget «--keyserver»)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "ber om nøkkelen %s fra %s tjener %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "ber om nøkkelen %s fra %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
msgid "no keyserver known\n"
msgstr "ingen kjent nøkkeltjener\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppet over «%s»: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "sender nøkkelen %s til %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "ber om nøkkel fra «%s»\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "merkelig størrelse for en kryptert sesjonsnøkkel (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s kryptert øktnøkkel\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "passordfrase generert med ukjent summeringsalgoritme %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "offentlig nøkkel er %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "offentlig nøkkel-kryptert data: god DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "kryptert med %u-bit %s-nøkkel, ID %s, opprettet %s\n"
# Do we really need to translate this string.
# The must some bug in the code.
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " «%s»\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "kryptert med %s-nøkkel, ID %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "offentlig nøkkel-dekryptering mislyktes: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "kryptert med %lu passordfraser\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "kryptert med 1 passordfrase\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "antar %s kryptert data\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA-kryptering er utilgjengelig. Prøver å bruke %s i stedet\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "ADVARSEL: meldinga var ikke integritetsbeskyttet\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "dekryptering ok\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ADVARSEL: kryptert melding er blitt manipulert.\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekryptering mislyktes: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Merk: senderen spesifiserte «kun for dine øyne»\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "opprinnelig filnavn=«%.*s»\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "selvstendig opphevelse - bruk «gpg --import» for å ta i bruk\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "fant ikke signatur\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "DÅRLIG signatur fra «%s»"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utgått signatur fra «%s»"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "God signatur fra «%s»"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "signaturbekreftelse ble hindret\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "disse flertydige signaturdataene kan ikke behandles\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur opprettet %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " bruker %s nøkkel %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatur laget %s ved hjelp av %s-nøkkel ID %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " aka «%s»"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Nøkkel tilgjengelig ved: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " aka «%s»"
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "ADVARSEL: denne nøkkelen er ikke sertifisert med en tillitsverdig signatur.\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Signatur utgått %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Signatur utgår %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binær"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "tekstmodus"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "ukjent"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr ", nøkkelalgoritme"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "ADVARSEL: ikke en separat signatur. Fila «%s» er IKKE bekreftet.\n"
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Klarte ikke å kontrollere signatur: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "ikke en separat signatur\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "ADVARSEL: fant flere signaturer. Kontrollerer bare den første.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "separat signatur av klasse 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) signatur\n"
@@@ -5724,67 -4469,54 +5707,67 @@@ msgstr "(rapportert feil: %s <%s>)\n
msgid "(further info: "
msgstr "(mer info: "
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: valget «%s» er utgått\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ADVARSEL: valget «%s» er utgått\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "bruk heller «%s%s»\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Ukomprimert"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "ukomprimert|ingen"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "«%s» er et flertydig valg\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "«%s» er et ukjent valg\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
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:1848
++#: g10/misc.c:1742
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "«%s» er en ukjent svak summeringsmetode\n"
@@@ -6286,35 -4919,33 +6269,41 @@@ msgstr "klarte ikke å åpne signert da
msgid "can't open signed data fd=%d: %s\n"
msgstr "klarte ikke å åpne signert data fd=%d: «%s»\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "sertifikatet egner seg ikke til kryptering\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonym mottaker. prøver hemmelig nøkkel %s …\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, det er du som er den anonyme mottakeren.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "gammel DEK-koding støttes ikke\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "krypteringsalgoritme %d%s er ukjent eller slått av\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "ADVARSEL: fant ikke krypteringsalgoritme %s i mottakers oppsett\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Merk: hemmelig nøkkel %s utgått %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "Merk: nøkkelen er opphevet"
@@@ -6481,7 -5084,6 +6470,7 @@@ msgstr "(Ingen beskrivelse oppgitt)\n
msgid "Is this okay? (y/N) "
msgstr "Er dette i orden? (j/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "nøkkelen ble svak. Prøver på nytt\n"
@@@ -6503,42 -5102,40 +6492,48 @@@ msgid "%s key %s requires a %zu bit or
msgstr ""
"%s-nøkkel %s krever kontrollsum på %zu eller flere bit (gjeldende sum: %s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "ADVARSEL: konflikt med signatur-kontrollsum i melding\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "du kan ikke bruke «%s» i «%s»-modus\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "ADVARSEL: undernøkkel %s for signering er ikke kryssertifisert\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "se %s for mer informasjon\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"ADVARSEL: undernøkkel %s for signering er kryssertifisert på ugyldig "
"grunnlag\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, 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] "offentlig nøkkel %s er %lu sekund nyere enn signaturen\n"
msgstr[1] "offentlig nøkkel %s er %lu sekunder nyere enn signaturen\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, 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] "offentlig nøkkel %s er %lu dag nyere enn signaturen\n"
msgstr[1] "offentlig nøkkel %s er %lu dager nyere enn signaturen\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6551,7 -5148,6 +6546,7 @@@ msgstr[1] "
"nøkkel %s ble opprettet %lu sekunder i fremtiden (tidsforskyvnings- eller "
"klokkeproblem)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6563,43 -5159,35 +6558,43 @@@ msgstr[1] "
"nøkkel %s ble opprettet %lu dager i fremtiden (tidsforskyvnings- eller "
"klokkeproblem)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Merk: signaturnøkkel %s utgått %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Merk: signaturnøkkel %s er opphevet\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "antatt ugyldig signatur fra nøkkel %s pga. ukjent «kritisk»-bit\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "nøkkel %s: ingen undernøkkel for undernøkkelopphevingssignatur\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "nøkkel %s: ingen undernøkkel for undernøkkelbindingssignatur\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "ADVARSEL: klarte ikke å %%-utvide notasjon (for lang).\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "ADVARSEL: klarte ikke å %%-utvide regelverkadresse (for lang).\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6608,40 -5196,32 +6603,40 @@@ msgstr "
"ADVARSEL: klarte ikke å %%-utvide foretrukket nøkkeltjener-adresse (for "
"lang).\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s-signatur fra: «%s»\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "ADVARSEL: tvungen bruk av %s (%d) bryter med mottakerens oppsett\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "signerer:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "bruker %s-kryptering\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppet over «%s»: er duplikat\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "hoppet over, fordi hemmelig nøkkel allerede er tilstede\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
@@@ -6725,7 -5289,6 +6720,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "fikk ikke tilgang til «%s»: %s\n"
@@@ -6834,76 -5375,59 +6829,76 @@@ msgstr "tekstlinjer som er lengre enn %
msgid "input line longer than %d characters\n"
msgstr "inndata-linje er lengre enn %d tegn\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "feil under transaksjonsstart i TOFU-database: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "feil under ferdigstillelse av transaksjon i TOFU-database: %s\n"
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "feil under reversering av transaksjon i TOFU-database: %s\n"
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "TOFU-databaseversjon støttes ikke: %s\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "feil under oppretting av midlertidig fil: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "feil under lesing av TOFU-database: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "klarte ikke å kontrollere versjon av TOFU-database: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "feil under oppstart av TOFU-database: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error reading TOFU database: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "feil under lesing av TOFU-database: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, c-format
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:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "feil under oppdatering av TOFU-database: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, fuzzy, c-format
#| msgid "The email address \"%s\" is associated with %d key:\n"
#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -6911,7 -5435,6 +6906,7 @@@ msgid "
"This is the first time the email address \"%s\" is being used with key %s."
msgstr "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, fuzzy, c-format
#| msgid "The email address \"%s\" is associated with %d key:\n"
#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -6920,7 -5443,6 +6915,7 @@@ msgid_plural "The email address \"%s\"
msgstr[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
#, fuzzy
#| msgid ""
#| "The key with fingerprint %s raised a conflict with the binding %s. Since "
@@@ -6930,51 -5452,42 +6925,51 @@@ msgstr "
"Nøkkel med fingeravtrykk %s forårsaket konflikt med tilknytning %s. Siden "
"regelen var «auto» er den nå endret til «ask» (spør)."
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "feil under henting av andre bruker-id-er: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, c-format
msgid "policy: %s"
msgstr "regelverk: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "feil under henting av signaturstatistikk: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, 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:1798
++#: g10/tofu.c:1797
msgid "this key"
msgstr "denne nøkkelen"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "Verified %ld messages signed by \"%s\"."
msgid "Verified %d message."
@@@ -6982,7 -5495,6 +6977,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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -6990,7 -5502,6 +6985,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "kryptert med %lu passordfraser\n"
msgstr[1] "kryptert med %lu passordfraser\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -6999,7 -5510,6 +6994,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:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -7008,7 -5518,6 +7003,7 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "%ld melding signert i fremtid."
msgstr[1] "%ld meldinger signert i fremtid."
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7017,7 -5526,6 +7012,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:1859
++#: g10/tofu.c:1858
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7026,7 -5534,6 +7021,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:1869
++#: g10/tofu.c:1868
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7035,7 -5542,6 +7030,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:1875
++#: g10/tofu.c:1874
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7044,7 -5550,6 +7039,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:1885
++#: g10/tofu.c:1884
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7053,7 -5558,6 +7048,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:1891
++#: g10/tofu.c:1890
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7062,14 -5566,12 +7057,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:1899
++#: g10/tofu.c:1898
#, 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:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7085,47 -5587,38 +7080,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr "gGaAuUnNdD"
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
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:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, 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:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "feil under endring av TOFU-regler: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, fuzzy, c-format
#| msgid "%d~year"
#| msgid_plural "%d~years"
@@@ -7134,7 -5627,6 +7129,7 @@@ msgid_plural "%lld~years
msgstr[0] "%d~år"
msgstr[1] "%d~år"
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, fuzzy, c-format
#| msgid "%d~month"
#| msgid_plural "%d~months"
@@@ -7143,14 -5635,12 +7138,14 @@@ msgid_plural "%lld~months
msgstr[0] "%d~måned"
msgstr[1] "%d~måneder"
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, fuzzy, c-format
#| msgid "%d~day"
#| msgid_plural "%d~days"
@@@ -7159,7 -5649,6 +7154,7 @@@ msgid_plural "%lld~days
msgstr[0] "%d~dag"
msgstr[1] "%d~dager"
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, fuzzy, c-format
#| msgid "%d~hour"
#| msgid_plural "%d~hours"
@@@ -7168,7 -5657,6 +7163,7 @@@ msgid_plural "%lld~hours
msgstr[0] "%d~time"
msgstr[1] "%d~timer"
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, fuzzy, c-format
#| msgid "%d~minute"
#| msgid_plural "%d~minutes"
@@@ -7177,7 -5665,6 +7172,7 @@@ msgid_plural "%lld~minutes
msgstr[0] "%d~minutt"
msgstr[1] "%d~minutter"
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, fuzzy, c-format
#| msgid "%d~second"
#| msgid_plural "%d~seconds"
@@@ -7186,20 -5673,17 +7181,20 @@@ msgid_plural "%lld~seconds
msgstr[0] "%d~sekund"
msgstr[1] "%d~sekunder"
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, 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:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Slettet %d signaturer.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7216,13 -5700,11 +7211,13 @@@ msgstr[1] "
"Bekreftet %ld meldinger signert av «%s»\n"
"siste %s."
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "kryptert med %lu passordfraser\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7239,13 -5721,11 +7234,13 @@@ msgstr[1] "
"Bekreftet %ld meldinger signert av «%s»\n"
"siste %s."
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "policy: %s"
msgid "(policy: %s)"
msgstr "regelverk: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
#, fuzzy
#| msgid "Warning: we've have yet to see a message signed by this key!\n"
msgid ""
@@@ -7254,7 -5734,6 +7249,7 @@@ msgstr "
"Advarsel: vi har enda ikke sett en melding som er signert av denne "
"nøkkelen.\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
#, fuzzy
#| msgid "Warning: we've only seen a single message signed by this key!\n"
msgid ""
@@@ -7262,7 -5741,6 +7257,7 @@@
msgstr ""
"Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
#, 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"
@@@ -7270,14 -5748,12 +7265,14 @@@ msgstr "
"Advarsel: vi har enda ikke sett en melding som er signert av denne "
"nøkkelen.\n"
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
#, 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:3260
++#: g10/tofu.c:3258
#, fuzzy, c-format
#| msgid ""
#| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7316,18 -5792,14 +7311,18 @@@ msgstr[1] "
"Bruk %s \n"
"for å markere nøkkelen som ugyldig hvis den virker mistenkelig.\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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "feil under åpning av TOFU-database: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7560,19 -5987,14 +7555,19 @@@ msgstr "
"Syntaks: kbxutil [valg] [filer]\n"
"Vis, eksporter eller importer Keybox-data\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA-modulus mangler eller er av annen størrelse enn %d bit\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "offentlig RSA-eksponent mangler eller er større enn %d bit\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-callback returnerte en feil: %s\n"
@@@ -7618,44 -6031,35 +7613,44 @@@ msgid "
"qualified signatures."
msgstr "|P|Skriv inn PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "feil under henting av ny PIN: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "feil under henting av CHV-status fra kort\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "svar inneholder ikke RSA-modulus\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the EC public point\n"
msgid "response does not contain the EC public key\n"
msgstr "svar inneholder ikke offentlig EC-punkt\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "svar inneholder ikke offentlig nøkkeldata\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
@@@ -7663,57 -6067,46 +7658,57 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "bruker forvalgt PIN som %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"klarte ikke å bruke forvalgt PIN som %s: %s. Lar være å bruke forvalgt PIN "
"senere\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Skriv inn PIN-kode"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "bekreftelse av CHV%d mislyktes: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "kortet er låst for godt.\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7723,23 -6116,18 +7718,23 @@@ msgstr[1] "%d Admin-PIN-forsøk gjenst�
#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
#. the start of the string. Use %0A (single percent) for a linefeed.
- #: scd/app-openpgp.c:2243
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Skriv inn admin-PIN"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Skriv inn PIN-kode"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Skriv inn tilbakestillingskode for kortet"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@@ -7747,107 -6135,83 +7742,107 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Ny tilbakestillingskode"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Ny PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||Skriv inn admin-PIN og ny admin-PIN"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Skriv inn PIN-kode og ny PIN-kode"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "feil under lesing av programdata\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "feil under lesing av fingeravtrykk DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "nøkkelen finnes allerede\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "gjeldende nøkkel blir erstattet\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "lager ny nøkkel\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "skriver ny nøkkel\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "tidsstempel for opprettelse mangler\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA-primtall %s mangler eller er av annen størrelse enn %d bit\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "klarte ikke å lagre nøkkel: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
msgid "unsupported curve\n"
msgstr "ustøttet kurve\n"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "vent mens nøkkel blir generert …\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "nøkkelgenerering mislyktes\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "nøkkelgenerering fullført (%d sekund)\n"
msgstr[1] "nøkkelgenerering fullført (%d sekunder)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "fingeravtrykk på kort samsvarer ikke med forespurt avtrykk\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer opprettet så langt: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "bekrefting av Admin PIN er foreløpig nektet gjennom denne kommandoen\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@@ -7867,11 -6228,9 +7862,11 @@@ msgstr "|N|Ny PIN
msgid "run in multi server mode (foreground)"
msgstr "kjør i multi-tjenermodus (forgrunn)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FIL|skriv logg til valgt FIL"
@@@ -7923,12 -6271,10 +7918,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "bruk valget «--daemon» for å kjøre programmet i bakgrunnen\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "startet håndteringsprogram for fd %d\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "avsluttet håndteringsprogram for fd %d\n"
@@@ -7999,9 -6330,6 +7994,9 @@@ msgstr "antall treff på sertifikater:
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "nøkkeloppslag i dirmngr-hurtiglager mislyktes: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
@@@ -8174,7 -6462,6 +8169,7 @@@ msgstr "gyldighetsmodell: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "kontrollsum på %u bit er ugyldig for en %u-bit %s-nøkkel\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(dette er algortime MD2)\n"
@@@ -8217,7 -6497,6 +8212,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen bruksområder for nøkler valgt. Antar alle bruksområder\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
@@@ -8475,11 -6701,9 +8470,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr "ressursproblem: oppbrukt kjerne\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(dette er algoritme RC2)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(dette ser ikke ut som en kryptert melding)\n"
@@@ -8508,127 -6727,96 +8503,127 @@@ msgstr "sertifikat «%s» slettet\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "sletting av sertifikat «%s» mislyktes: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "ingen gyldige mottakere valgt\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "vis eksterne nøkler"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "vis sertifikatkjede "
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "importer sertifikater"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "eksporter sertifikater"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "registrer smartkort"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "send en kommando til dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "kall gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "lag base64-kodet utdata"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "forvent inndata i «PEM»-format"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "forvent inndata i «base-64»-format"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "forvent inndata i binærformat"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "aldri spør CRL"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "kontroller gyldighet med OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|antall sertifikater som skal være med"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FIL|hent regler fra valgt FIL"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "ikke kontroller sertifikatregler"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "hent manglende utstedersertifikat"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "ikke bruk terminal i det hele tatt"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "buntmodus: aldri spør"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "svar automatisk ja på de fleste spørsmål"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "svar automatisk nei på de fleste spørsmål"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8638,46 -6826,37 +8633,46 @@@ msgstr "
"Signer, kontroller, krypter eller dekrypter.\n"
"Forvalgt handling avhenger av inndata.\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Merk: det er ikke mulig å kryptere til «%s»: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "«%s» er en ukjent kontrollmodell\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: vertsnavn mangler\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: hopper over denne linja\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "klarte ikke å tolke nøkkeltjener\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importerer sertifikat «%s»\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "klarte ikke å signere med «%s»: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@@ -8738,7 -6905,6 +8733,7 @@@ msgstr "det oppstod en feil under nytt
msgid "error storing flags: %s\n"
msgstr "feil under lagring av valg: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Feil - "
@@@ -8773,7 -6935,6 +8768,7 @@@ msgstr "
"\n"
"%s%sEr du sikker på at du vil gjøre dette?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8792,51 -6952,41 +8787,51 @@@ msgstr "
"«%s»\n"
"Merk: dette sertifikatet lager ikke «kvalifiserte» signaturer."
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"kontrollsum-algoritme %d (%s) for undertegnet %d støttes ikke. Bruker %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "kontrollsum-algoritme brukt av undertegnet %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "søk etter godkjent sertifikat mislyktes: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Signatur fullført"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[dato ikke oppgitt]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " ved bruk av sertifikat-ID 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"ugyldig signatur. Kontrollsum-attributt for melding samsvarer ikke med "
"attributt for utregnet sum\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Gyldig signatur fra"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " også kjent som"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Dette er en godkjent signatur\n"
@@@ -9609,113 -7598,85 +9604,113 @@@ msgstr "forventet fullstendig filsti\n
msgid "looking up '%s'\n"
msgstr "slår opp «%s»\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "vis innhold i CRL-hurtiglager"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|ADR|hent CRL fra valgt nettADResse"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "slå av dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "tøm hurtiglager"
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "kjør uten å spørre bruker"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "tving innlasting av utdatert CRL"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "tillat sending av OCSP-forespørsler"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "hindre bruk av HTTP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "hindre bruk av LDAP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr "ignorer HTTP CRL-distribusjonspunkter"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr "ignorer LDAP CRL-distribusjonspunkter"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
"legg til tjenere i tjenerliste som blir oppdaget via CRL-distribusjonspunkter"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP-svartjeneste signert av FPR"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|ikke vis flere enn N antall elementer per spørring"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FIL|bruk CA-sertifikater i valgt FIL til HKP via TLS"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr "kjør all nettverkstrafikk gjennom Tor"
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9724,11 -7685,9 +9719,11 @@@ msgstr "
"@\n"
"Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9736,77 -7695,60 +9731,77 @@@ msgstr "
"Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
"Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "bruk: %s [valg] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "kolon tillates ikke i sokkelnavn\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "henting av CRL fra «%s» mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: for lang linje. Hoppet over\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: lesefeil: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "SIGHUP mottatt. Leser inn oppsett på nytt og tømmer hurtiglagre\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM mottatt. Slår av …\n"
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "slår av under tvang\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT mottatt. Slår av umiddelbart\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "signal %d mottatt. Ingen handling definert\n"
@@@ -9976,7 -7882,14 +9971,18 @@@ msgstr "«%s» er ikke en LDAP-adresse\
msgid "'%s' is an invalid LDAP URL\n"
msgstr "«%s» er en ugyldig LDAP-adresse\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "feil under utskrift av logglinje: %s\n"
@@@ -10041,12 -7942,10 +10047,12 @@@ msgstr "legger til «%s:%d» i ldap-tje
msgid "malloc failed: %s\n"
msgstr "malloc mislyktes: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: mønsteret «%s» er ugyldig\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search overskred tjenerens størrelsesgrense\n"
@@@ -10106,12 -7993,6 +10112,7 @@@ msgstr "feil under tilkobling til «%s�
msgid "error reading HTTP response for '%s': %s\n"
msgstr "feil under lesing av HTTP-svar for «%s»: %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "feil under tolking av OCSP-svar for «%s»: %s\n"
@@@ -10225,76 -8082,60 +10226,76 @@@ msgstr "OCSP-svartjeneste sendte statu
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP-svartjeneste sendte for gammel status\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "ldapserver mangler"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "serienummer mangler i sertifikat-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
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "«assuan_inquire» mislyktes: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "«fetch_cert_by_url» mislyktes: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "feil under sending av data: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "«start_cert_fetch» mislyktes: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "«fetch_next_cert» mislyktes: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d overskredet\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "klarte ikke å starte opp tjener: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan-godkjenningsproblem: %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan-behandling mislyktes: %s\n"
@@@ -10423,198 -8235,151 +10424,198 @@@ msgstr "sending av linje mislyktes: %s\
msgid "error sending standard options: %s\n"
msgstr "feil under sending av standardvalg: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Styring av diagnostikk-utdata"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Oppsettsvalg"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Nyttige feilsøkingsvalg"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Sikkerhetsvalg"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
"|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Valg som håndhever passordfrase-regler"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
#, fuzzy
#| msgid "do not allow to bypass the passphrase policy"
msgid "do not allow bypassing the passphrase policy"
msgstr "ikke tillat overstyring av passordfrase-regler"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|endre minimal passordfrase-lengde til N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|krev at passordfraser inneholder minst N antall spesialtegn og tall"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|regn passord som ugyldig etter N antall dager"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "ikke tillat gjenbruk av gamle passordfraser"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPES|sett opp e-post-alias"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Oppsett for nøkkeltjenere"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "tillat PKA-oppslag (DNS-forespørsler)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MEKANISMER|bruk valgte MEKANISME til å finne nøkler med e-postadresse"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "slå av all tilgang til dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "ikke se etter rotsertifikater i CRL"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Valg som styrer utdata-format"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Valg som styrer grensesnitt og håndheving av regler"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr "Valg som styrer bruk av Tor"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Oppsett for HTTP-tjenere"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "bruk systemets innstilling for HTTP-mellomtjener"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Oppsett for bruk av LDAP-tjenere"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "LDAP-tjenerliste"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Oppsett for OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
#, fuzzy
#| msgid "GPG for OpenPGP"
msgid "OpenPGP"
msgstr "GPG for OpenPGP"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
#, fuzzy
#| msgid "Smartcard Daemon"
msgid "Smartcards"
msgstr "Smartcard-bakgrunnsprosess"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
#, fuzzy
#| msgid "GPG for S/MIME"
msgid "S/MIME"
msgstr "GPG for S/MIME"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "nettverksfeil"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "PIN and Passphrase Entry"
msgid "Passphrase Entry"
msgstr "Skriving av PIN og passordfrase"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "Komponent egner seg ikke for oppstart"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Ekstern bekreftelse av komponent %s mislyktes"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing '%s': %s\n"
msgid "error closing '%s'\n"
msgstr "feil under lukking av «%s»: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error hashing '%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -10688,11 -8437,9 +10689,11 @@@ msgstr "bruk som utdatafil
msgid "activate changes at runtime, if possible"
msgstr "ta i bruk endringer under kjøring, hvis mulig"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10700,15 -8447,12 +10701,15 @@@ msgstr "
"Syntaks: @GPGCONF@ [valg]\n"
"Behandle oppsettsvalg for verktøy i @GNUPG at -systemet\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Komponent-argument mangler"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Fant ikke komponent"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Ingen argumenter tillatt"
diff --cc po/pl.po
index 0be86e4,4df8e68..ec855ee
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -19,7 -18,6 +19,7 @@@
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "nie udało się uzyskać blokady pinentry: %s\n"
@@@ -30,47 -28,38 +30,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|_Anuluj"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
#, fuzzy
#| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
msgstr "|pinentry-label|_Anuluj"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "Enter new passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "Wprowadź nowe hasło
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Jakość:"
@@@ -88,72 -76,56 +88,72 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Jakość wpisanego wyżej tekstu.\n"
"Kryteria jakości można uzyskać od administratora."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr "Proszę wprowadzić swój PIN, żeby odblokować klucz tajny dla tej sesji"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
"Proszę wprowadzić swoje hasło, żeby odblokować klucz tajny dla tej sesji"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Hasło:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "nie pasują - proszę spróbować jeszcze raz"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (próba %d z %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "PIN zbyt długi"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Hasło zbyt długie"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Niewłaściwy znak w PIN-ie"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "PIN zbyt krótki"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Niepoprawny PIN"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Niepoprawne hasło"
@@@ -162,60 -133,38 +162,60 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh większe niż %d bitów nie są obsługiwane\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "wykryto kartę o numerze seryjnym: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "nie znaleziono pasującego klucza karty: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Zgoda"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Odmowa"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Proszę ponownie wprowadzić to hasło"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -249,63 -193,49 +249,63 @@@ msgstr "
"Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A %s"
"%%0A %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Proszę włożyć kartę z numerem seryjnym"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Proszę wyjąć obecną kartę i włożyć kartę z numerem seryjnym"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "PIN administracyjny"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Kod resetujący"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0ADo wpisywania należy użyć klawiatury czytnika."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Powtórz ten kod resetujący"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Powtórz ten PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Powtórz ten PIN"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Kod resetujący nie powtórzony poprawnie; spróbuj jeszcze raz"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK nie powtórzony poprawnie; spróbuj jeszcze raz"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Proszę wprowadzić PIN%s%s%s aby odblokować kartę"
@@@ -409,8 -326,6 +409,8 @@@ msgstr "Proszę wprowadzić hasło do%0
msgid "Please enter the new passphrase"
msgstr "Proszę wprowadzić nowe hasło"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -418,142 -333,106 +418,146 @@@ msgstr "
"@Opcje:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "uruchomienie w trybie demona (w tle)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "uruchomienie w trybie serwera"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "mniej komunikatów"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "wyjście poleceń w stylu sh"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "wyjście poleceń w stylu csh"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "nie odczepianie od konsoli"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "nie przechwytywanie klawiatury i myszy"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "użycie pliku loga dla serwera"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|użycie PGM jako programu SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "nie używanie SCdaemona"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ignorowanie żądań zmiany TTY"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ignorowanie żądań zmiany ekranu X"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "nie używanie pamięci PIN-ów przy podpisywaniu"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "nie zezwalanie na ponowne użycie starych haseł"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "zezwolenie na predefiniowane hasło"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr ""
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -565,158 -444,124 +569,163 @@@ msgstr "
"Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarządzanie kluczem tajnym dla GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "nie można utworzyć gniazda: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
msgstr "nazwa gniazda `%s' zbyt długa\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent już działa - nie uruchamianie nowego\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "błąd podczas pobierania nonce z gniazda\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() nie powiodło się: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
msgstr "katalog ,,%s'' utworzony\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
#| msgid "stat() failed for `%s': %s\n"
msgid "stat() failed for '%s': %s\n"
msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
#| msgid "can't use `%s' as home directory\n"
msgid "can't use '%s' as home directory\n"
msgstr "nie można użyć ,,%s'' jako katalogu domowego\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "błąd odczytu nonce z fd %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "obsługa 0x%lx dla fd %d uruchomiona\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obsługa 0x%lx dla fd %d zakończona\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "obsługa ssh 0x%lx dla fd %d uruchomiona\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "obsługa ssh 0x%lx dla fd %d zakończona\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, 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:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr ""
"Wywołanie: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA (-h podaje pomoc)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -724,8 -569,6 +733,8 @@@ msgstr "
"Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
"Utrzymuwanie pamięci haseł\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -733,9 -576,6 +742,9 @@@ msgstr "
"@Polecenia:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -789,8 -621,6 +798,8 @@@ msgstr "anulowano\n
msgid "error while asking for the passphrase: %s\n"
msgstr "błąd podczas pytania o hasło: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -857,8 -678,6 +866,8 @@@ msgstr "
msgid "Yes"
msgstr "Tak"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Nie"
@@@ -911,7 -723,6 +920,7 @@@ msgstr "Zmiana hasła
msgid "I'll change it later"
msgstr "Zmienię je później"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -919,13 -730,11 +928,13 @@@
"%%0A?"
msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "włączenie klucza do użycia"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -946,7 -752,6 +955,7 @@@ msgstr "Klucz %s używa niebezpieczneg
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
@@@ -988,8 -783,6 +997,8 @@@ msgstr "błąd tworzenia potoku: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "błąd tworzenia potoku: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "błąd podczas tworzenia procesu: %s\n"
@@@ -1121,7 -888,6 +1130,7 @@@ msgstr "brak miejsca w bezpiecznej pami
msgid "out of core while allocating %lu bytes"
msgstr "brak miejsca podczas przydzielania %lu bajtów"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
@@@ -1137,7 -901,6 +1146,7 @@@ msgstr "%s:%u: przestarzała opcja ,,%s
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją - nie ma efektu\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1249,8 -989,6 +1258,8 @@@ msgstr "Klucz sesji utworzony
msgid "algorithm: %s"
msgstr "algorytm: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "nieobsługiwany algorytm: %s"
@@@ -1419,7 -1119,6 +1428,7 @@@ msgstr "błędna opcja
msgid "missing argument for option \"%.50s\"\n"
msgstr "brak argumentu dla opcji ,,%.50s''\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "invalid argument for option \"%.50s\"\n"
@@@ -1445,7 -1140,6 +1454,7 @@@ msgstr "opcja ,,%.50s'' jest niejednozn
msgid "command \"%.50s\" is ambiguous\n"
msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "brak pamięci\n"
@@@ -1508,8 -1191,6 +1517,8 @@@ msgstr "blokada ,,%s'' nie założona:
msgid "waiting for lock %s...\n"
msgstr "oczekiwanie na blokadę %s...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
@@@ -1639,7 -1294,6 +1648,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "OSTRZEŻENIE: napotkano błędne dane adnotacji\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "nie udało się przekazać zapytania %s do klienta\n"
@@@ -1650,35 -1303,33 +1659,42 @@@
msgid "Enter passphrase: "
msgstr "Hasło\n"
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s jeszcze nie działa z %s!\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Karta OpenPGP niedostępna: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Wykryto kartę OpenPGP nr %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "nie działa w trybie wsadowym\n"
@@@ -1686,14 -1336,9 +1702,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "To polecenie jest dostępne tylko dla kart w wersji 2\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Kod resetujący nie jest (już lub w ogóle) dostępny\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Twój wybór? "
@@@ -1750,92 -1382,57 +1766,77 @@@ msgstr "Błąd: pełne personalia zbyt
msgid "URL to retrieve public key: "
msgstr "URL do odczytania klucza publicznego: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Błąd: URL zbyt długi (limit to %d znaków).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "błąd odczytu ,,%s'': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "błąd zapisu ,,%s'': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Dane logowania (nazwa konta): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Błąd: dane logowania zbyt długie (limit to %d znaków).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Prywatne dane DO: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Błąd: prywatne DO zbyt długie (limit to %d znaków).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Preferowane języki: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Błąd: niewłaściwa długość tekstu preferencji.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Błąd: niewłaściwe znaki w tekście preferencji.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Płeć (M - mężczyzna, F - kobieta lub spacja): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Błąd: niewłaściwa odpowiedź.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "Odcisk CA:"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Błąd: niewłaściwie sformatowany odcisk.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "operacja na kluczu niewykonalna: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "to nie jest karta OpenPGP"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Zastąpić istniejący klucz? (t/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1850,57 -1447,45 +1851,57 @@@ msgstr "
" Jeśli tworzenie klucza nie powiedzie się, proszę sprawdzić\n"
" dokumentację karty, aby poznać dozwolone rozmiary.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Jakiej długości klucz do podpisywania wygenerować? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Jakiej długości klucz do szyfrowania wygenerować? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Jakiej długości klucz do uwierzytelniania wygenerować? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrąglono do %u bitów\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Rozmiary kluczy %s muszą być z przedziału %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "błąd podczas zmiany rozmiaru klucza %d na %u bitów: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Stworzyć poza kartą kopię zapasową klucza szyfrującego? (T/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "UWAGA: klucze są już zapisane na karcie!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Zastąpić istniejące klucze? (t/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1915,169 -1500,125 +1916,169 @@@ msgstr "
" PIN = ,,%s'' PIN administracyjny = ,,%s''\n"
"Należy je zmienić przy użyciu polecenia --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Proszę wybrać rodzaj klucza do wygenerowania:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Klucz do podpisów\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Klucz do szyfrowania\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Klucz do uwierzytelniania\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Niewłaściwy wybór.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Proszę wybrać gdzie zapisać klucz:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "odczyt nie powiódł się: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "To polecenie nie jest dostępne w trybie %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "UWAGA: klucze są już zapisane na karcie!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Podpisać go? (t/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "wyjście z tego menu"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "pokazanie poleceń administratora"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "ten tekst pomocy"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "wypisanie wszystkich dostępnych danych"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "zmiana nazwy posiadacza karty"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "zmiana URL-a do odczytu klucza"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "pobranie klucza określonego w URL-u karty"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "zmiana nazwy logowania"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "zmiana preferowanych języków"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "zmiana płci posiadacza karty"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "zmiana odcisku CA"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "wygenerowanie nowych kluczy"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "menu do zmiany lub odblokowania PIN-u"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "odblokowanie PIN-u przy użyciu kodu resetującego"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/karta> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Polecenie tylko dla administratora\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Polecenia dla administratora są dozwolone\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Polecenia dla administratora nie są dozwolone\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawne polecenie (spróbuj ,,help'')\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "błąd odczytu bloku kluczy: %s\n"
@@@ -2138,40 -1667,33 +2139,40 @@@ msgstr "dla klucza publicznego ,,%s'' i
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "aby go usunąć należy najpierw użyć opcji \"--delete-secret-key\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "błąd podczas tworzenia hasła: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"ustawiony tryb S2K nie pozwala użyć pakietu ESK dla szyfru symetrycznego\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "szyfrem %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr ",,%s'' już jest skompresowany\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "OSTRZEŻENIE: plik ,,%s'' jest pusty\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "odczyt z ,,%s''\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2179,7 -1701,16 +2180,20 @@@ msgstr "
"OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
"adresata\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "szyfr ,,%s'' nie jest dostępny w trybie %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją - nie ma efektu\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2188,38 -1719,32 +2202,39 @@@ msgstr "
"OSTRZEŻENIE: wymuszone użycie kompresji %s (%d) kłóci się z ustawieniami "
"adresata\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami adresata\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zaszyfrowany dla: ,,%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "%s nie jest dostępne w trybie %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "dane zaszyfrowano za pomocą %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"OSTRZEŻENIE: wiadomość była szyfrowana kluczem słabym szyfru symetrycznego.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problem podczas obróbki pakietu szyfrowego\n"
@@@ -2305,39 -1813,30 +2320,39 @@@ msgstr "usunięcie jak największej cz�
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: pominięty: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "zapis do ,,%s''\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "klucz %s: zawartość klucza na karcie - pominięto\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "eksport kluczy tajnych nie jest dozwolony\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "klucz %s: klucz PGP 2.x - pominięty\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2409,228 -1895,181 +2424,234 @@@ msgstr "|NAZWA|użycie NAZWY jako domy�
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "złożenie podpisu"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "złożenie podpisu pod dokumentem"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "złożenie podpisu oddzielonego od dokumentu"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "szyfrowanie danych"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domyślne)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "lista kluczy"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "lista kluczy i podpisów"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "wypisanie i sprawdzenie podpisów kluczy"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisków"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu unieważnienia klucza"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "usunięcie klucza ze zbioru kluczy publicznych"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "złożenie podpisu na kluczu"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "złożenie prywatnego podpisu na kluczu"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "złożenie podpisu na kluczu"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "złożenie prywatnego podpisu na kluczu"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "zmiana hasła"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "eksport kluczy do pliku"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "eksport kluczy do serwera kluczy"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "import kluczy z serwera kluczy"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "szukanie kluczy na serwerze"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "odświeżenie wszystkich kluczy z serwera"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "import/dołączenie kluczy"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "wyświetlenie stanu karty"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "zmiana danych na karcie"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "zmiana PIN-u karty"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "wypisanie skrótów wiadomości"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "uruchomienie w trybie serwera"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
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:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|PLIK|zapis wyjścia do PLIKU"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plików"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "ścisłe zachowanie OpenPGP"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2638,7 -2077,6 +2659,7 @@@ msgstr "
"@\n"
"(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2670,13 -2108,11 +2691,13 @@@ msgstr "
" --list-keys [nazwy] pokazanie klucze\n"
" --fingerprint [nazwy] pokazanie odcisków kluczy\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2691,7 -2127,6 +2712,7 @@@ msgstr "
"Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
"Domyślnie wykonywana operacja zależy od danych wejściowych\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2699,78 -2134,64 +2720,78 @@@ msgstr "
"\n"
"Obsługiwane algorytmy:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Asymetryczne: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Symetryczne: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Skrótów: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Kompresji: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "wywołanie: gpgsm [opcje]"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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 -2199,6 +2799,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2788,7 -2208,6 +2809,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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 -2215,6 +2817,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, 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 -2222,6 +2825,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2815,7 -2232,6 +2836,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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 -2239,348 +2844,442 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, 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:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
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:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, 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:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "niezrozumiały URL serwera kluczy\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
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:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpisów z danymi PKA"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "zwiększenie zaufania podpisów z poprawnymi danymi PKA"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno używać %s z %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w połączeniu z %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "wartość completes-needed musi być większa od 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "wartość marginals-needed musi być większa od 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "niewłaściwe domyślne ustawienia\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "niewłaściwe ustawienia szyfrów\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "niewłaściwe ustawienia skrótów\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie działa z %s!\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "skrót ,,%s'' nie jest dostępny w trybie %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, 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"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "kompresja ,,%s'' nie jest dostępna w trybie %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, 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:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "nie można użyć --symmetric --encrypt w trybie %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "nie można użyć --symmetric --sign --encrypt w trybie %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powiódł się: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiodło się: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoją wiadomość ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@@ -3289,7 -2590,6 +3291,7 @@@ msgstr "|PLIK|pobieranie kluczy ze zbio
msgid "make timestamp conflicts only a warning"
msgstr "nie traktować konfliktu datowników jako błędu"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|pisanie opisu stanu do deskryptora FD"
@@@ -3319,144 -2614,120 +3321,150 @@@ msgstr "Pomoc niedostępna
msgid "No help available for '%s'"
msgstr "Brak pomocy o ,,%s''"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "import podpisów oznaczonych jako tylko lokalne"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "naprawienie uszkodzeń z serwera pks przy imporcie"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "nie uaktualnianie bazy zaufania po imporcie"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "nie uaktualnianie bazy zaufania po imporcie"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "okazanie odcisku klucza"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "przyjmowanie tylko uaktualnień istniejących kluczy"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "usuwanie bezużytecznych części kluczy po imporcie"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "usuwanie jak największej części kluczy po imporcie"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "przyjęcie wejścia w formacie binarnym"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "okazanie odcisku klucza"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d zostaje pominięty\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Ogółem przetworzonych kluczy: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " pominiętych nowych kluczy: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " pominiętych nowych kluczy: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identyfikatora: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " dołączono do zbioru: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmian: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nowych identyfikatorów: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nowych podkluczy: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nowych podpisów: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nowych unieważnień kluczy: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " tajnych kluczy wczytanych: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tajnych kluczy dodanych: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajnych kluczy bez zmian: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nie włączono do zbioru: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " podpisów wyczyszczonych: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "ID użytkownika wyczyszczonych: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3465,193 -2736,155 +3473,193 @@@ msgstr "
"OSTRZEŻENIE: klucz %s zawiera preferencje dla niedostępnych\n"
"algorytmów dla tych ID użytkownika:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " ,,%s'': preferowany szyfr %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm skrótu %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm kompresji %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "zdecydowanie sugerowane jest uaktualnienie ustawień i ponowne\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "rozesłanie tego klucza w celu uniknięcia niezgodności algorytmów\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"można uaktualnić swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "klucz %s: brak identyfikatora użytkownika\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "pominięty ,,%s'': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klucz %s: podklucz uszkodzony przez serwer został naprawiony\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "klucz %s: przyjęto identyfikator nie podpisany nim samym ,,%s''\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klucz %s: brak poprawnych identyfikatorów użytkownika\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "to może być spowodowane brakiem podpisu klucza nim samym\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klucz %s: brak klucza publicznego: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klucz %s: nowy klucz - pominięty\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "błąd zapisu zbioru kluczy ,,%s'': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klucz %s: nie zgadza się z lokalną kopią\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "klucz %s: nie można odczytać oryginalnego bloku klucza: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klucz %s: ,,%s'' 1 nowy identyfikator użytkownika\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "klucz %s: ,,%s'' %d nowych identyfikatorów użytkownika\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klucz %s: ,,%s'' %d nowych podpisów\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpisów wyczyszczonych\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klucz %s: ,,%s'' %d identyfikator użytkownika wyczyszczony\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "klucz %s: ,,%s'' %d identyfikatorów użytkownika wyczyszczonych\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klucz %s: ,,%s'' bez zmian\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "pominięty: klucz prywatny jest już wpisany\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "błąd wysyłania polecenia %s: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "klucz %s: klucz tajny z błędnym szyfrem %d - pominięty\n"
@@@ -3666,145 -2899,118 +3674,145 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"klucz %s: brak klucza publicznego którego dotyczy wczytany certyfikat\n"
" unieważnienia\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klucz %s: niepoprawny certyfikat unieważnienia: %s - odrzucony\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klucz %s: ,,%s'' certyfikat unieważnienia został już wczytany\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klucz %s: brak identyfikatora użytkownika do podpisu\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obsługiwany\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "klucz %s: niepoprawny podpis na identyfikatorze ,,%s''\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "klucz %s: nieprawidłowy bezpośredni podpis\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klucz %s: brak podklucza do dowiązania\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klucz %s: niepoprawne dowiązanie podklucza\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klucz %s: usunięto wielokrotne dowiązanie podklucza\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klucz %s: brak podklucza, którego dotyczy unieważnienie\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klucz %s: niepoprawne unieważnienie podklucza\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klucz %s: usunięto wielokrotne unieważnienie podklucza\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klucz %s: pominięto identyfikator użytkownika ,,%s''\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klucz %s: podklucz pominięty\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pominięty\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"klucz %s: pominięto certyfikat unieważnienia umieszczony\n"
" w niewłaściwym miejscu\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "klucz %s: pominięto - niepoprawny certyfikat unieważnienia: %s\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "klucz %s: pominięto - podpis na podkluczu w niewłaściwym miejscu\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "klucz %s: pominięto - nieoczekiwana klasa podpisu (0x%02X)\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "key %s: dołączono powtórzony identyfikator użytkownika\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
" zapytanie o unieważniający klucz %s w serwerze kluczy\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
" brak unieważniającego klucza %s.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %s: ,,%s'' dodany certyfikat unieważnienia\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %s: dodano bezpośredni podpis\n"
@@@ -3850,90 -3049,12 +3858,15 @@@ msgstr "błąd podczas otwierania ,,%s'
msgid "failed to rebuild keyring cache: %s\n"
msgstr "nie powiodła się odbudowa bufora bazy: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[unieważnienie]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[podpis klucza nim samym]"
- #: 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"
- msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "karta nie obsługuje algorytmu skrótu %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "Good signature from"
- msgid " (reordered signatures follow)"
- msgstr "Poprawny podpis złożony przez"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
- msgid "key %s:\n"
- msgstr "pominięty ,,%s'': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
- msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
- msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 podpis nie został sprawdzony z powodu braku klucza\n"
- msgstr[1] "1 podpis nie został sprawdzony z powodu braku klucza\n"
- msgstr[2] "1 podpis nie został sprawdzony z powodu braku klucza\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d niepoprawnych podpisów\n"
- msgstr[1] "%d niepoprawnych podpisów\n"
- msgstr[2] "%d niepoprawnych podpisów\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Poprawny podpis złożony przez"
- msgstr[1] "Poprawny podpis złożony przez"
- msgstr[2] "Poprawny podpis złożony przez"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3944,17 -3065,14 +3877,17 @@@ msgstr "
"tożsamości innych użytkowników (czy sprawdzi on odciski kluczy pobrane\n"
"z różnych źródeł, dokumenty potwierdzające tożsamość, itd.).\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = mam ograniczone zaufanie\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = mam pełne zaufanie\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3964,50 -3082,38 +3897,50 @@@ msgstr "
"Poziom wyższy niż 1 umożliwia używanie podpisywanego właśnie klucza\n"
"do wykonywania zaufanych podpisów w twoim imieniu.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Proszę wpisać domenę ograniczającą ten podpis lub Enter dla żadnej.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Identyfikator użytkownika ,,%s'' został unieważniony."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Czy na pewno chcesz podpisać? (t/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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Nie da się złożyć podpisu.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Identyfikator użytkownika ,,%s'' przekroczył swój termin ważności."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Identyfikator użytkownika ,,%s'' jest podpisywalny. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Podpisać go? (t/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4016,11 -3122,9 +3949,11 @@@ msgstr "
"Podpis klucza nim samym na ,,%s''\n"
"jest podpisem złożonym przez PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Czy chcesz zamienić go na podpis OpenPGP? (t/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4029,11 -3133,9 +3962,11 @@@ msgstr "
"Twój podpis na ,,%s''\n"
"przekroczył datę ważności.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Czy chcesz zastąpić przeterminowany podpis nowym? (t/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4042,45 -3144,36 +3975,45 @@@ msgstr "
"Twój podpis na ,,%s''\n"
"jest podpisem prywatnym (lokalnym).\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Czy chcesz zamienić go na pełny, publiczny, eksportowalny podpis? (t/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr ",,%s'' jest już lokalnie podpisany kluczem %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr ",,%s'' jest już podpisany kluczem %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Czy na pewno chcesz to podpisać jeszcze raz? (t/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nie ma nic do podpisania kluczem %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Data ważności tego klucza upłynęła!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Ważność tego klucza wygasa %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Czy chcesz żeby ważność Twojego podpisu wygasała w tej samej chwili? (T/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4089,33 -3182,27 +4022,33 @@@ msgstr "
"Jak dokładnie została przez Ciebie sprawdzona tożsamość tej osoby?\n"
"Jeśli nie wiesz co odpowiedzieć, podaj ,,0''.\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nie odpowiem na to pytanie. %s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) W ogóle nie.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Pobieżnie.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Bardzo dokładnie.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Twój wybór (,,?'' podaje więcej informacji): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4124,238 -3211,184 +4057,238 @@@ msgstr "
"Czy jesteś naprawdę pewien, że chcesz podpisać ten klucz\n"
"swoim kluczem ,,%s'' (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "To będzie podpis klucza nim samym.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"OSTRZEŻENIE: podpis nie zostanie oznaczony jako prywatny "
"(nieeksportowalny).\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"OSTRZEŻENIE: podpis nie zostanie oznaczony jako nie podlegający "
"unieważnieniu.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis zostanie oznaczony jako nie podlegający unieważnieniu.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Tożsamość użytkownika nie została w ogóle sprawdzona.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Tożsamość użytkownika została sprawdzona pobieżnie.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Tożsamość użytkownika została dokładnie sprawdzona.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Czy na pewno podpisać? (t/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "złożenie podpisu nie powiodło się: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Klucz ma tylko zaślepkę albo elementy na karcie - nie ma hasła do zmiany.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "błąd podczas tworzenia hasła: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "zapis zmian i wyjście"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "okazanie odcisku klucza"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Uchwyt klucza: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "lista kluczy i identyfikatorów użytkownika"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "wybór identyfikatora użytkownika N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "wybór podklucza N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "sprawdzenie podpisów"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"złożenie podpisu na wybranych identyfikatorach użytkownika [* poniżej "
"powiązane polecenia]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr ""
"złożenie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
"użytkownika"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "podpisanie wybranych identyfikatorów użytkownika sygnaturą zaufania"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"podpisanie wybranych identyfikatorów użytkownika sygnaturą nie podlegającą "
"unieważnieniu"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "dodanie nowego identyfikatora użytkownika do klucza"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "dodanie zdjęcia użytkownika do klucza"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "usunięcie wybranych identyfikatorów użytkownika z klucza"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "dodanie podklucza"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "dodanie klucza do karty procesorowej"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "przeniesienie klucza na kartę procesorową"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "przeniesienie klucza zapasowego na kartę procesorową"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "usunięcie wybranych podkluczy"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "dodanie klucza unieważniającego"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "usunięcie podpisów z wybranych identyfikatorów użytkownika"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "zmiana daty wygaśnięcia dla klucza lub wybranych podkluczy"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "oznaczenie wybranego identyfikatora użytkownika jako głównego"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "ustawienia (zaawansowane)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "rozbudowana lista ustawień"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "ustawienie listy preferencji dla wybranych identyfikatorów użytkownika"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"ustawienie URL-a preferowanego serwera kluczy dla wybranych identyfikatorów "
"użytkownika"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "ustawienie adnotacji dla wybranych identyfikatorów użytkownika"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "zmiana hasła klucza"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "zmiana zaufania właściciela"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "unieważnienie podpisów na wybranych identyfikatorach użytkownika"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "unieważnienie wybranych identyfikatorów użytkownika"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "unieważnienie klucza lub wybranych podkluczy"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "włączenie klucza do użycia"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "wyłączenie klucza z użycia"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "okazanie wybranych identyfikatorów - zdjęć"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"zagęszczanie bezużytecznych ID użytkowników i usuwanie bezużytecznych "
"podpisów z kluczy"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"zagęszczanie bezużytecznych ID użytkowników i usuwanie wszystkich podpisów z "
"kluczy"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Dostępny jest klucz tajny.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4375,290 -3408,238 +4308,302 @@@ msgstr "
"(ltsign,\n"
" tnrsign itd.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Klucz unieważniony."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Czy na pewno podpisać wszystkie identyfikatory użytkownika? (t/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "Czy na pewno podpisać wszystkie identyfikatory użytkownika? (t/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Podpowiedź: wybierz identyfikatory użytkownika do podpisania.\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Nieznany rodzaj podpisu ,,%s''\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "To polecenie nie jest dostępne w trybie %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Musisz wybrać co najmniej jeden identyfikator użytkownika.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Nie możesz usunąć ostatniego identyfikatora użytkownika!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr ""
"Czy na pewno usunąć wszystkie wybrane identyfikatory użytkownika? (t/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Czy na pewno usunąć ten identyfikator użytkownika? (t/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Czy na pewno przenieść główny klucz (t/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Musisz wybrać dokładnie jeden klucz.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Polecenie oczekuje argumentu będącego nazwą pliku\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Nie można otworzyć ,,%s'': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Błąd podczas odczytu klucza zapasowego z `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Musisz wybrać co najmniej jeden klucz.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Czy na pewno chcesz usunąć ten klucz? (t/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Czy na pewno unieważnić wszystkie wybrane identyfikatory użytkownika? (t/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Czy na pewno unieważnić ten identyfikator użytkownika? (t/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Czy na pewno chcesz unieważnić cały klucz? (t/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Czy na pewno chcesz unieważnić wybrane podklucze? (t/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Czy na pewno chcesz unieważnić ten podklucz? (t/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Zaufanie użytkownika nie może być ustawione podczas używania bazy zaufania\n"
"dostarczonej przez użytkownika\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Ustawienie listy ustawień na:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Czy na pewno uaktualnić ustawienia dla wybranych identyfikatorów? (t/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Czy na pewno uaktualnić ustawienia? (t/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Zapisać zmiany? (t/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Wyjść bez zapisania zmian? (t/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "zapis zmian nie powiódł się: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Klucz nie został zmieniony więc zapis zmian nie jest konieczny.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Nie możesz usunąć ostatniego identyfikatora użytkownika!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "niewłaściwy odcisk"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "nie udało się pobrać odcisku\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "niepoprawna wartość\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Brak takiego identyfikatora użytkownika.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Nie ma nic do podpisania kluczem %s\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia podpisu\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "invalid fingerprint"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "niewłaściwy odcisk"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Skrót: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Ustawienia: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "no-modify dla serwera kluczy"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Preferowany serwer kluczy: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Klucze PGP 2.x nie zawierają opisu ustawień.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Ten klucz został unieważniony %s przez klucz użytkownika %s %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Klucz może zostać unieważniony przez klucz %s użytkownika %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(poufne)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "utworzono: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "unieważniono: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "wygasł: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "wygasa: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "użycie: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "nr-karty: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "zaufanie: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "poprawność: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Ten klucz został wyłączony z użytku"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4666,18 -3647,12 +4611,18 @@@ 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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "wygasł"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4686,17 -3661,14 +4631,17 @@@ msgstr "
" jako główny. Wykonanie tego polecenie może więc spowodować\n"
" wyświetlanie innego identyfikatora jako domyślnego głównego.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4705,35 -3677,27 +4650,35 @@@ msgstr "
"OSTRZEŻENIE: To jest klucz PGP wersji 2. Dodanie zdjęcia spowoduje, że\n"
" niektóre wersje przestaną go rozumieć.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Czy dalej chcesz je dodać? (t/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Do klucza dla PGP 2.x nie można dodać zdjęcia.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Usunąć ten poprawny podpis? (t/N/w) "
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Usunąć ten nieznany podpis? (t/N/w) "
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4742,20 -3706,16 +4687,20 @@@ msgstr[0] "%d podpis usunięty.\n
msgstr[1] "%d podpis usunięty.\n"
msgstr[2] "%d podpis usunięty.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nic nie zostało usunięte.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "niepoprawny"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4764,17 -3724,14 +4709,17 @@@ msgstr[0] "Identyfikator użytkownika ,
msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4784,37 -3741,29 +4729,37 @@@ msgstr "
" unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
" go rozumieć.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Do klucza dla PGP 2.x nie można wyznaczyć klucza unieważniającego.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Podaj identyfikator klucza unieważniającego: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "klucza PGP 2.x nie można wyznaczyć jako unieważniającego\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "nie można wyznaczyć klucza do unieważniania jego samego\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "ten klucz został już uznany kluczem unieważniającym\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"OSTRZEŻENIE: nie można cofnąć wyznaczenia klucza jako unieważniającego!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4823,177 -3772,145 +4768,183 @@@ msgid "
"N) "
msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Zmiana daty ważności podklucza.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty ważności głównego klucza.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "podklucz podpisujący %s jest już skrośnie podpisany\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"podklucz %s nie jest podpisujący, więc nie musi być skrośnie podpisany\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominięty\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Podaj preferowany URL serwera kluczy: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Czy na pewno chcesz go usunąć? (t/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Kontynuować? (t/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "Brak podklucza o numerze %d.\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Brak podklucza o numerze %d.\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identyfikator użytkownika: ,,%s''\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podpisany twoim kluczem %s w %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (podpis nieeksportowalny) "
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Ważność tego klucza wygasła %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Czy dalej chcesz go unieważnić? (t/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Nie podpisane przez ciebie.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Te identyfikatory na kluczu %s są podpisane przez Ciebie:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (podpis nieunieważnialny) "
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "unieważniony przez twój klucz %s w %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"OSTRZEŻENIE: identyfikator użytkownika podpisany za %d sekund (w "
"przyszłości)\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Nie możesz usunąć ostatniego identyfikatora użytkownika!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klucz %s jest już unieważniony.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklucz %s jest już unieważniony.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Wyświetlanie zdjęcia w formacie %s o rozmiarze %ld bajtów dla klucza %s (id "
"%d).\n"
++#: g10/keygen.c: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/keygen.c:317
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
@@@ -5444,8 -4284,6 +5395,8 @@@ msgstr "
"ilości\n"
"entropii.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiodła się: %s\n"
@@@ -5522,7 -4347,6 +5473,7 @@@ msgstr "błąd podczas zapisu zbioru kl
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5530,7 -4354,6 +5481,7 @@@ msgstr "
"Ten klucz nie może być wykorzystany do szyfrowania. Komendą \"--edit-key\"\n"
"można dodać do niego podklucz szyfrujący.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5538,7 -4361,6 +5489,7 @@@ msgstr "
"klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
"czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5546,50 -4368,39 +5497,50 @@@ msgstr "
"klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
"czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Część tajna głównego klucza jest niedostępna.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Część tajna głównego klucza jest zapisana na karcie.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzyć? (t/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "nigdy "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Krytyczny regulamin podpisu: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Regulamin podpisu: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Krytyczny preferowany serwer kluczy: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Krytyczne adnotacje podpisu: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Adnotacje podpisu: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5598,7 -4409,22 +5549,25 @@@ msgstr[0] "%d niepoprawnych podpisów\n
msgstr[1] "%d niepoprawnych podpisów\n"
msgstr[2] "%d niepoprawnych podpisów\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d niepoprawnych podpisów\n"
+ msgstr[1] "%d niepoprawnych podpisów\n"
+ msgstr[2] "%d niepoprawnych podpisów\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 podpis nie został sprawdzony z powodu braku klucza\n"
+ msgstr[1] "1 podpis nie został sprawdzony z powodu braku klucza\n"
+ msgstr[2] "1 podpis nie został sprawdzony z powodu braku klucza\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5607,7 -4433,6 +5576,7 @@@ msgstr[0] "1 podpis nie został sprawdz
msgstr[1] "1 podpis nie został sprawdzony z powodu błędu\n"
msgstr[2] "1 podpis nie został sprawdzony z powodu błędu\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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"
@@@ -5615,33 -4440,26 +5584,33 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Zbiór kluczy"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Odcisk klucza głównego:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Odcisk klucza głównego:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Odcisk klucza ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
@@@ -5755,265 -4552,216 +5724,271 @@@ msgstr "klucz nie został odnaleziony n
msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwerów kluczy (użyj opcji --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "zapytanie o klucz %s z serwera %s %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "zapytanie o klucz %s z %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "brak akcji serwera kluczy!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "pominięty ,,%s'': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "wysyłanie klucza %s na %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "zapytanie o klucz %s z %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "OSTRZEŻENIE: nie można pobrać URI %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "dziwny rozmiar jak na zaszyfrowany klucz sesyjny (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "klucz sesyjny zaszyfrowany %s\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "hasło wygenerowane nieznanym algorytmem skrótu %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "klucz publiczny to %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " ,,%s''\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "błąd odszyfrowywania kluczem publicznym: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "zaszyfrowane za pomocą %lu haseł\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "zaszyfrowane jednym hasłem\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "przyjmując że dane zostały zaszyfrowane za pomocą %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "szyfr IDEA nie jest dostępny, próba użycia %s zamiast niego\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "OSTRZEŻENIE: wiadomość nie była zabezpieczona przed manipulacją\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "odszyfrowanie poprawne\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "błąd odszyfrowywania: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "UWAGA: nadawca zaznaczył że wiadomość nie powinna być zapisywana\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "pierwotna nazwa pliku='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "OSTRZEŻENIE: widziano wiele czystych tekstów\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"osobny certyfikat unieważnienia - użyj ,,gpg --import'' aby go wczytać\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "nie znaleziono podpisu\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Przeterminowany podpis złożony przez ,,%s''"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Poprawny podpis złożony przez ,,%s''"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "nie można obsłużyć tych wieloznacznych danych podpisu\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Podpisano w %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " przy użyciu klucza %s %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpisano w %s kluczem %s o numerze %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " alias ,,%s''"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Klucz dostępny w: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[niepewne]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " alias ,,%s''"
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "OSTRZEŻENIE: Ten klucz nie jest poświadczony zaufanym podpisem!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Ważność podpisu wygasła %s.\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Ważność podpisu wygasa %s.\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "podpis %s, skrót %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binarny"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "tekstowy"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "nieznany"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algorytm: %s"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie można sprawdzić podpisu: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "nie jest oddzielonym podpisem.\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"OSTRZEŻENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x.\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x).\n"
@@@ -6076,73 -4813,60 +6051,73 @@@ msgstr "błąd odczytu w ,,%s'': %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d jest przestarzałą opcją ,,%s''\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "w jej miejsce należy użyć ,,%s%s''\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Nieskompresowany"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "nieskompresowany|brak"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "niejednoznaczna opcja ,,%s''\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
#, 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:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6664,36 -5289,34 +6639,42 @@@ msgstr "nie można otworzyć podpisaneg
msgid "can't open signed data fd=%d: %s\n"
msgstr "nie można otworzyć podpisanych danych z fd=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "certyfikat nie nadaje się do szyfrowania\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "adresat anonimowy; sprawdzanie klucza tajnego %s...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "OK, to my jesteśmy adresatem anonimowym.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "stary, nieobsługiwany algorytm szyfrowania klucza sesyjnego\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algorytm szyfrujący %d%s jest nieznany lub został wyłączony\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "OSTRZEŻENIE: brak algorytmu szyfrującego %s w ustawieniach odbiorcy\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "UWAGA: ważność klucza tajnego %s wygasła %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6859,7 -5454,6 +6840,7 @@@ msgstr "(nie podano)\n
msgid "Is this okay? (y/N) "
msgstr "Informacje poprawne? (t/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "wygenerowano słaby klucz - operacja zostaje powtórzona\n"
@@@ -6882,27 -5473,27 +6863,33 @@@ msgstr "Klucz %s używa niebezpieczneg
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "Klucz DSA %s wymaga %u-bitowego lub większego skrótu\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "OSTRZEŻENIE: konflikt skrótów podpisów w wiadomości\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "%s nie jest dostępne w trybie %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "OSTRZEŻENIE: podklucz podpisujący %s nie jest skrośnie podpisany\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "objaśnienie można przeczytać tutaj: %s\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"OSTRZEŻENIE: podklucz podpisujący %s jest niepoprawnie skrośnie podpisany\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6911,7 -5502,6 +6898,7 @@@ msgstr[0] "klucz publiczny %s jest o %l
msgstr[1] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
msgstr[2] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6920,7 -5510,6 +6907,7 @@@ msgstr[0] "klucz publiczny %s jest o %l
msgstr[1] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
msgstr[2] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6938,7 -5527,6 +6925,7 @@@ msgstr[2] "
"klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
"czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6955,43 -5543,36 +6942,43 @@@ msgstr[2] "
"klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
"czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "UWAGA: klucz podpisujący %s przekroczył datę ważności %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "UWAGA: klucz podpisujący %s został unieważniony\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"uznano za zły podpis utworzony kluczem %s z powodu nieznanego bitu "
"krytycznego\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "klucz %s: brak podklucza dla podpisu unieważnienia podklucza\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "klucz %s: brak podklucza dowiązywanego podpisem\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"OSTRZEŻENIE: nie można rozwinąć %% w URL adnotacji (jest zbyt długi).\n"
" Użyty zostanie nie rozwinięty.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6999,7 -5580,6 +6986,7 @@@ msgstr "
"OSTRZEŻENIE: nie można rozwinąć znaczników %% w URL regulaminu\n"
" (jest zbyt długi). Użyty zostanie nie rozwinięty.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -7008,12 -5588,10 +6995,12 @@@ msgstr "
"OSTRZEŻENIE: nie można rozwinąć znaczników %% w URL-u preferowanego\n"
" serwera kluczy (jest zbyt długi). Użyty zostanie nie rozwinięty.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "podpis %s/%s złożony przez: ,,%s''\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7021,31 -5599,25 +7008,31 @@@ msgstr "
"OSTRZEŻENIE: wymuszone użycie skrótu %s (%d) kłóci się z ustawieniami "
"adresata\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "podpis:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "zostanie użyty szyfr %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "pominięty ,,%s'': duplikat\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "pominięty: klucz prywatny jest już wpisany\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniający "
@@@ -7135,7 -5691,6 +7122,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7247,89 -5780,71 +7234,89 @@@ msgstr "nie można obsłużyć linii te
msgid "input line longer than %d characters\n"
msgstr "linia dłuższa niż %d znaków\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "błąd wysyłania standardowych opcji: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "nieobsługiwany algorytm: %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "błąd tworzenia pliku tymczasowego: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "błąd wysyłania polecenia %s: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "błąd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "błąd wysyłania polecenia %s: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "błąd podczas otwierania ,,%s'': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "błąd wysyłania polecenia %s: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, c-format
msgid "The email address \"%s\" is associated with %d key!"
msgid_plural "The email address \"%s\" is associated with %d keys!"
@@@ -7337,42 -5852,35 +7324,42 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "poprawność: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, 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:1730
++#: g10/tofu.c:1729
#, 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"
@@@ -7380,18 -5888,15 +7367,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista kluczy"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7400,7 -5905,6 +7387,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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7409,7 -5913,6 +7396,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:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7418,7 -5921,6 +7405,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:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7427,7 -5929,6 +7414,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:1853
++#: g10/tofu.c:1852
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7435,7 -5936,6 +7422,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1858
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7443,7 -5943,6 +7430,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1869
++#: g10/tofu.c:1868
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7451,7 -5950,6 +7438,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1875
++#: g10/tofu.c:1874
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7459,7 -5957,6 +7446,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1885
++#: g10/tofu.c:1884
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7467,7 -5964,6 +7454,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1891
++#: g10/tofu.c:1890
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7475,12 -5971,10 +7462,12 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7489,48 -5983,39 +7476,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "błąd zapisu klucza: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, 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:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7538,7 -6023,6 +7525,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7546,7 -6030,6 +7533,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7554,7 -6037,6 +7541,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7562,7 -6044,6 +7549,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7570,7 -6051,6 +7557,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7578,7 -6058,6 +7565,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7586,18 -6065,15 +7573,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d podpisów usuniętych.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7606,13 -6082,11 +7593,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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "zaszyfrowane za pomocą %lu haseł\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7621,31 -6095,25 +7608,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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "poprawność: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7663,19 -6131,15 +7650,19 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, 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:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7920,19 -6339,14 +7907,19 @@@ msgstr "
"Składnia: kbxutil [opcje] [pliki]\n"
"Wypisywanie, eksport, import danych Keybox\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "reszta RSA brakująca lub o rozmiarze innym niż %d bity\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "publiczny wykładnik RSA brakujący lub większy niż %d bity\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "Zapytanie zwrotne o PIN zwróciło błąd: %s\n"
@@@ -7985,44 -6390,35 +7972,44 @@@ msgstr "
"|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla klucza do tworzenia "
"podpisów kwalifikowanych."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "nie powiódł się zapis odcisku: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "nie powiódł się zapis daty utworzenia: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "błąd podczas odczytu stanu CHV z karty\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "odpowiedź nie zawiera współczynnika RSA\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public key\n"
msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
@@@ -8030,57 -6426,46 +8017,57 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "użycie domyślnego PIN-u jako %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"nie udało się użyć domyślnego PIN-u jako %s: %s - wyłączenie dalszego "
"domyślnego użycia\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Proszę wpisać PIN"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN dla CHV%d jest zbyt krótki; minimalna długość to %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "karta została trwale zablokowana!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -8095,23 -6480,18 +8082,23 @@@ msgstr[2] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Proszę wprowadzić PIN administracyjny"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "dostęp do poleceń administratora nie został skonfigurowany\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Proszę wpisać PIN"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Proszę wprowadzić kod resetujący dla karty"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Kod resetujący zbyt krótki; minimalna długość to %d\n"
@@@ -8119,79 -6499,61 +8106,79 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Nowy kod resetujący"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Nowy PIN administracyjny"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Nowy PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Proszę wprowadzić PIN i nowy PIN"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "błąd podczas odczytu danych aplikacji\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "błąd podczas odczytu odcisku DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "klucz już istnieje\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "istniejący klucz zostanie zastąpiony\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "generowanie nowego klucza\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "zapisywanie nowego klucza\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "brak datownika utworzenia\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "liczba pierwsza %s RSA brakująca lub o rozmiarze innym niż %d bitów\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nie powiódł się zapis klucza: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported algorithm: %s"
msgid "unsupported curve\n"
msgstr "nieobsługiwany algorytm: %s"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "proszę czekać na wygenerowanie klucza...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "generowanie klucza nie powiodło się\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -8200,32 -6562,26 +8187,32 @@@ msgstr[0] "generowanie klucza zakończo
msgstr[1] "generowanie klucza zakończone (%d sekund)\n"
msgstr[2] "generowanie klucza zakończone (%d sekund)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "odcisk na karcie nie zgadza się z żądanym\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "karta nie obsługuje algorytmu skrótu %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dotychczas stworzono podpisów: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
"zabroniona\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@@ -8245,11 -6598,9 +8232,11 @@@ msgstr "|N|Początkowy nowy PIN
msgid "run in multi server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|PLIK|zapisanie logów do PLIKu"
@@@ -8310,12 -6650,10 +8297,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "obsługa fd %d uruchomiona\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obsługa fd %d zakończona\n"
@@@ -8392,9 -6715,6 +8379,9 @@@ msgid "dirmngr cache-only key lookup fa
msgstr ""
"wyszukiwanie klucza tylko w pamięci podręcznej dirmngr nie powiodło się: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "nie udało się przydzielić uchwytu keyDB\n"
@@@ -8566,7 -6846,6 +8553,7 @@@ msgstr "użyty model poprawności: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(to jest algorytm MD2)\n"
@@@ -8609,7 -6881,6 +8596,7 @@@ msgid "no key usage specified - assumin
msgstr ""
"nie określono sposobu wykorzystania klucza - przyjęto wszystkie sposoby\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "błąd podczas pobierania informacji o wykorzystaniu klucza: %s\n"
@@@ -8886,11 -7104,9 +8873,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr "problem z zasobami: brak pamięci\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(to jest algorytm RC2)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(to nie wygląda na zaszyfrowaną wiadomość)\n"
@@@ -8922,129 -7133,98 +8909,129 @@@ msgstr "certyfikat ,,%s'' usunięty\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "nie podano poprawnych adresatów\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "wypisanie kluczy zewnętrznych"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "wypisanie łańcucha certyfikatów"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "import certyfikatów"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "eksport certyfikatów"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "zarejestrowanie karty procesorowej"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "wywołanie gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "tworzenie wyjścia zakodowanego base-64"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "przyjęcie wejścia w formacie PEM"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "przyjęcie wejścia w formacie base-64"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "przyjęcie wejścia w formacie binarnym"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "pominięcie CRL"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "sprawdzenie poprawności przy użyciu OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|liczba certyfikatów do dołączenia"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "nie sprawdzanie polityk certyfikatów"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "pobranie brakujących certyfikatów wystawców"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "nie używanie w ogóle terminala"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKU"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "tryb wsadowy: bez żadnych pytań"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -9060,50 -7240,41 +9047,50 @@@ msgstr "
"S/MIME\n"
"Domyślnie wykonywana operacja zależy od danych wejściowych\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "UWAGA: nie można zaszyfrować do ,,%s'': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "nieznany model poprawności ,,%s''\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: nie podano nazwy hosta\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: podano hasło bez użytkownika\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: linia pominięta\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "niezrozumiały adres serwera kluczy\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "import wspólnych certyfikatów ,,%s''\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
@@@ -9165,7 -7324,6 +9152,7 @@@ msgstr "problem z ponownym odszukaniem
msgid "error storing flags: %s\n"
msgstr "błąd zapisywania flag: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Błąd - "
@@@ -9202,7 -7356,6 +9189,7 @@@ msgstr "
"\n"
"%s%sNa pewno chcesz to zrobić?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9221,50 -7373,40 +9208,50 @@@ msgstr "
",,%s''\n"
"Należy zauważyć, że ten certyfikat NIE utworzy kwalifikowanego podpisu!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"algorytm skrótu %d (%s) dla podpisującego %d nie jest obsługiwany; użycie "
"%s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "algorytm skrótu użyty dla podpisującego %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Podpisano w "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[nie podano daty]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " przy użyciu certyfikatu o ID 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr "błędny podpis: atrybut skrótu wiadomości nie zgadza się z obliczonym\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Poprawny podpis złożony przez"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " alias"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "To jest podpis kwalifikowany\n"
@@@ -10144,127 -8125,99 +10131,127 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "|FILE|run commands from FILE on startup"
msgid "|FILE|load CRL from FILE into cache"
msgstr "|PLIK|uruchomienie poleceń z PLIKU przy starcie"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKu"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Wyjść bez zapisania zmian? (t/N) "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
"|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|używaj serwera kluczy URL"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10277,13 -8230,11 +10264,13 @@@ msgstr "
"@\n"
"(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10295,88 -8246,71 +10282,88 @@@ msgstr "
"Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarządzanie kluczem tajnym dla GnuPG\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "podano błędny poziom diagnostyki ,,%s''\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "wywołanie: gpgsm [opcje]"
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "Nie wolno używać %s z %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
#| msgid "line too long - skipped\n"
msgid "%s:%u: line too long - skipped\n"
msgstr "linia zbyt długa - pominięta\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "niewłaściwy odcisk"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "błąd odczytu w ,,%s'': %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "nie wymuszono"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10566,7 -8464,16 +10553,20 @@@ msgstr ",,%s'' nie jest plikiem JPEG\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ #| msgid "error running `%s': exit status %d\n"
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
+
++#: dirmngr/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"
+ msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
#| msgid "error writing to %s: %s\n"
msgid "error printing log line: %s\n"
@@@ -10638,12 -8533,10 +10638,12 @@@ msgstr "wysyłanie klucza %s na serwer
msgid "malloc failed: %s\n"
msgstr "select nie powiodło się: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10715,13 -8596,6 +10715,7 @@@ msgstr "błąd zapisu do ,,%s'': %s\n
msgid "error reading HTTP response for '%s': %s\n"
msgstr "błąd odczytu z %s: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- #| msgid "error running `%s': exit status %d\n"
- msgid "error accessing '%s': http status %u\n"
- msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
@@@ -10854,86 -8704,70 +10848,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "wysyłanie linii nie powiodło się: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "wysyłanie linii nie powiodło się: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select nie powiodło się: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "błąd wysyłania polecenia %s: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select nie powiodło się: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select nie powiodło się: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
#| msgid "cannot allocate outfile string: %s\n"
msgid "can't allocate control structure: %s\n"
msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
#| msgid "failed to create stream from socket: %s\n"
msgid "failed to allocate assuan context: %s\n"
msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "nie powiódł się zapis daty utworzenia: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -11087,197 -8892,150 +11081,197 @@@ msgstr "wysyłanie linii nie powiodło
msgid "error sending standard options: %s\n"
msgstr "błąd wysyłania standardowych opcji: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Opcje sterujące wyjściem diagnostycznym"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Opcje sterujące konfiguracją"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Opcje przydatne do diagnostyki"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Opcje sterujące bezpieczeństwem"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|przedawnienie kluczy SSH po N sekundach"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
"|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Opcje wymuszające politykę haseł"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "nie zezwalanie na pominięcie polityki haseł"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|ustawienie minimalnej długości nowych haseł na N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|wymaganie przynajmniej N znaków niealfanumerycznych w nowym haśle"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|PLIK|sprawdzanie nowych haseł pod kątem wzorców z PLIKU"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|przedawnianie haseł po N dniach"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "nie zezwalanie na ponowne użycie starych haseł"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
"|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|określ adres email"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Konfiguracja dla serwerów kluczy"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|używaj serwera kluczy URL"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
"|MECHANIZMY|wykorzystaj MECHANIZMY do wyszukiwania kluczy na podstawie "
"adresów e-mail"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "zablokuj dostęp do dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "nie sprawdzanie CRL dla głównych certyfikatów"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Opcje sterujące formatem wyjścia"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Opcje sterujące interaktywnością i wymuszaniem"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Opcje sterujące bezpieczeństwem"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Konfiguracja dla serwerów HTTP"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "użycie systemowego ustawienia proxy HTTP"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguracja używanych serwerów LDAP"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "lista serwerów LDAP"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Konfiguracja dla OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Niepoprawne hasło"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Nie znaleziono komponentu"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Uwaga, określenia grup są ignorowane\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing '%s'\n"
msgstr "błąd zamykania %s: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -11359,13 -9101,11 +11353,13 @@@ msgstr "plik wyjściowy
msgid "activate changes at runtime, if possible"
msgstr "uaktywnienie zmian w czasie działania o ile to możliwe"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11377,15 -9117,12 +11371,15 @@@ msgstr "
"Składnia: gpgconf [opcje]\n"
"Zarządzanie opcjami konfiguracji dla narzędzi z systemu GnuPG\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Wymagany jest jeden argument komponentu"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Nie znaleziono komponentu"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Argument nie jest dozwolony"
diff --cc po/pt.po
index c194648,b905742..d8dd2c4
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -18,7 -17,6 +18,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
@@@ -29,40 -27,31 +29,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Você quer realmente remover as chaves selecionadas? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "frase-secreta inválida
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -80,75 -68,59 +80,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Por favor digite a frase secreta \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "frase secreta incorrecta"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "frase secreta demasiado longa\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "frase secreta demasiado longa\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Caracter inválido no nome\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "MPI incorreto"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "frase secreta incorrecta"
@@@ -158,152 -129,111 +158,152 @@@
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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muda a frase secreta"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de dispersão: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repita a frase secreta: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Repita a frase secreta: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita a frase secreta: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -382,8 -299,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,74 -308,53 +393,74 @@@ msgstr "
"Opções:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "A chave foi substituída"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detalhado"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "procurar chaves num servidor de chaves"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizar a base de dados de confiança"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
@@@ -468,51 -362,43 +468,55 @@@ msgstr "
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "não suportado"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -521,178 -407,135 +525,183 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVISO: \"%s\" é uma opção depreciada\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossível criar %s: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "o gpg-agent não está disponível nesta sessão\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualização falhou: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossível criar directoria: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualização da chave secreta falhou: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -543,6 +709,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -756,8 -588,6 +765,8 @@@ msgstr "cancelado pelo utilizador\n
msgid "error while asking for the passphrase: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -816,8 -637,6 +825,8 @@@ msgstr "
msgid "Yes"
msgstr "sim"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -868,19 -680,16 +877,19 @@@ msgstr "muda a frase secreta
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "activa uma chave"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -900,7 -706,6 +909,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "verificação da assinatura criada falhou: %s\n"
@@@ -941,8 -736,6 +950,8 @@@ msgstr "erro na criação da frase secr
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -1071,7 -838,6 +1080,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
@@@ -1086,7 -850,6 +1095,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVISO: \"%s\" é uma opção depreciada\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1201,8 -941,6 +1210,8 @@@ msgstr "%s: porta-chaves criado\n
msgid "algorithm: %s"
msgstr "armadura: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1394,7 -1094,6 +1403,7 @@@ msgstr "opções de importação invál
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "opções de importação inválidas\n"
@@@ -1419,7 -1114,6 +1428,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "não processado"
@@@ -1478,8 -1161,6 +1487,8 @@@ msgstr "chave pública %08lX não encon
msgid "waiting for lock %s...\n"
msgstr "a escrever chave privada para `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1612,7 -1267,6 +1621,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: dados de notação inválidos encontrados\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1621,35 -1274,32 +1630,41 @@@
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVISO: %s sobrepõe %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s não faz sentido com %s!\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "chave secreta não disponível"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossível fazer isso em modo não-interativo\n"
@@@ -1659,15 -1308,10 +1674,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Este comando não é permitido no modo %s.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "partes da chave secreta não disponíveis\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Opção? "
@@@ -1729,154 -1360,107 +1744,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "a escrever chave pública para `%s'\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "preferências actualizadas"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "caracter inválido na cadeia de caractéres da preferência\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter inválido na cadeia de caractéres da preferência\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "%s: versão de ficheiro inválida %d\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "mostra impressão digital"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "%s: versão de ficheiro inválida %d\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "nenhum dado OpenPGP válido encontrado.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ignorado: a chave secreta já está presente\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1884,179 -1468,135 +1884,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Opção inválida.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "motivo da revocação: "
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "actualização falhou: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Este comando não é permitido no modo %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ignorado: a chave secreta já está presente\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Realmente assinar? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "sair deste menu"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "mostra esta ajuda"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Nenhuma ajuda disponível"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "muda a data de validade"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "muda os valores de confiança"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra impressão digital"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "gerar um novo par de chaves"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inválido (tente \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
@@@ -2118,46 -1646,46 +2118,57 @@@ msgstr "há uma chave secreta para a ch
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "utilize a opção \"--delete-secret-keys\" para a apagar primeiro.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "não é possível utilizar o pacote ESK simétrico devido ao modo S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "assinatura falhou: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "%s' já comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVISO: `%s' é um ficheiro vazio\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lendo de `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2166,39 -1694,33 +2177,40 @@@ msgstr "
"ao forçar o algoritmo de compressão %s (%d) viola as preferências do "
"destinatário\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "dados cifrados com %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado com algoritmo desconhecido %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVISO: A mensagem foi cifrada com uma chave fraca na cifragem simétrica.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problema ao tratar pacote cifrado\n"
@@@ -2283,40 -1788,31 +2295,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorado: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "a escrever para `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -2386,238 -1869,190 +2398,243 @@@ msgstr "|NOME|usar NOME como chave secr
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opções de importação inválidas\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "cifrar dados"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra simétrica"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "decifrar dados (acção por omissão)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verificar uma assinatura"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "listar as chaves"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impressões digitais"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "listar as chaves secretas"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revogação"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves público"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exportar chaves para um servidor de chaves"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importar chaves de um servidor de chaves"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "procurar chaves num servidor de chaves"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importar/fundir chaves"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "actualizar a base de dados de confiança"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "criar saída com armadura ascii"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, 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:564
++#: g10/gpg.c:567
#, 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:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "usar modo de texto canônico"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "não fazer alterações"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrepôr"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2625,7 -2060,6 +2642,7 @@@ msgstr "
"@\n"
"(Veja a página man para uma lista completa de comandos e opções)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2655,13 -2089,11 +2672,13 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impressões digitais\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2676,7 -2108,6 +2693,7 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a operação por omissão depende dos dados de entrada\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2684,547 -2115,416 +2701,529 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Chave pública: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Dispersão: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Compressão: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opções] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "criado um novo ficheiro de configuração `%s'\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de política de assinatura dada é inválida\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave está"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatário por omissão desconhecido `%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Endereço eletrónico inválido\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de dispersão inválido `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opções de exportação inválidas\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opções de exportação inválidas\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opções de importação inválidas\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "opções de importação inválidas\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opções de importação inválidas\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opções de exportação inválidas\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "opções de exportação inválidas\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opções de importação inválidas\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "opções de importação inválidas\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s não é um conjunto de caracteres válido\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de política de assinatura dada é inválida\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s não é um conjunto de caracteres válido\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, 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:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opções de exportação inválidas\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "opções de exportação inválidas\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, 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:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrepõe %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s não é permitido com %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s não faz sentido com %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado é inválido\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado é inválido\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
#, 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:3749
++#: g10/gpg.c:3754
#, 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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferências por omissão inválidas\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferências pessoais de cifra inválidas\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferências pessoais de 'digest' inválidas\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferências pessoais de compressão inválidas\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s não faz sentido com %s!\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, 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:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualização da chave secreta falhou: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
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:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de política de assinatura dada é inválida\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de política de assinatura dada é inválida\n"
@@@ -3239,7 -2537,6 +3238,7 @@@ msgstr "Remover esta chave do porta-cha
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informações de estado para o\n"
@@@ -3270,332 -2562,269 +3269,337 @@@ msgstr "Nenhuma ajuda disponível
msgid "No help available for '%s'"
msgstr "Nenhuma ajuda disponível para `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizar a base de dados de confiança"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizar a base de dados de confiança"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "mostra impressão digital"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta não utilizável"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "mostra impressão digital"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves processadas até agora\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Número total processado: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de utilizadores: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " não modificados: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de utilizadores: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revogações de chaves: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas não modificadas: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " não importadas: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave pública não encontrada: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: chave nova - ignorada\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave pública \"%s\" importada\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: não corresponde à nossa cópia\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" não modificada\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "ignorado: a chave secreta já está presente\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chave `%s' não encontrada: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n"
@@@ -3610,144 -2839,117 +3614,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: sem chave pública - impossível aplicar certificado\n"
"de revogação\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revogação importado\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chave %08lX: algoritmo de chave pública não suportado no utilizador \"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chave %08lX: auto-assinatura inválida do utilizador \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chave %08lX: sem subchave para ligação de chaves\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: ligação de subchave inválida\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chave %08lX: apagada ligação múltipla de subchave \n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chave %08lX: sem subchave para revocação de chave\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revocação de subchave inválida\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chave %08lX: removida revogação múltiplace de subchaves\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de utilizador '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocação "
"%08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não "
"presente.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@@ -3789,79 -2984,12 +3793,15 @@@ msgstr "erro na leitura de `%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revogação]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[auto-assinatura]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "assinatura %s de: \"%s\"\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Assinatura correcta de \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "ignorado `%s': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Utilizador \"%s\" está revocado."
- msgstr[1] "Utilizador \"%s\" está revocado."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 assinatura não verificada por falta de chave\n"
- msgstr[1] "1 assinatura não verificada por falta de chave\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d assinaturas incorrectas\n"
- msgstr[1] "%d assinaturas incorrectas\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Assinatura correcta de \""
- msgstr[1] "Assinatura correcta de \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3874,68 -3002,53 +3814,68 @@@ msgstr "
"(vendo passaportes, verificando impressões digitais...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Confio moderadamente\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Confio plenamente\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Utilizador \"%s\" está revocado."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Não foi possível assinar.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Utilizador \"%s\" está revocado."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3944,11 -3057,9 +3884,11 @@@ msgstr "
"A sua auto-assinatura em \"%s\"\n"
"é uma assinatura do tipo PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Quer promovê-la a uma auto-assinatura OpenPGP? (s/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3957,12 -3068,10 +3897,12 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"é uma assinatura local.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
#, fuzzy
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3971,44 -3080,35 +3911,44 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"é uma assinatura local.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Quer promovê-la a uma assinatura exportável? (s/N)"
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" já foi assinado localmente pela chave %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" já foi assinado pela chave %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Esta chave expirou!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave vai expirar em %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4018,32 -3118,26 +3958,32 @@@ msgstr "
"pertence\n"
"à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Não vou responder.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Não verifiquei.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Verifiquei por alto.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Verifiquei com bastante cuidado.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = mostrar mais informações\n"
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4052,268 -3146,214 +3992,268 @@@ msgstr "
"Você tem certeza de que quer assinar esta chave com\n"
"a sua chave: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Isto será uma auto-assinatura.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"AVISO: a assinatura não será marcada como não-exportável.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"AVISO: a assinatura não será marcada como não-revocável.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"A assinatura será marcada como não-exportável.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"A assinatura será marcada como não-revocável.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Não verifiquei esta chave.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Verifiquei por alto esta chave.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Verifiquei esta chave com muito cuidado.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "gravar e sair"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra impressão digital"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Notação de assinatura: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "lista chave e identificadores de utilizadores"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "revoga assinaturas"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "assina a chave localmente"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "adiciona um novo ID de utilizador"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "adiciona um identificador fotográfico"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "remove ID de utilizador"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "remove uma chave secundária"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "adiciona uma chave de revocação"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"Realmente actualizar as preferências para os utilizadores seleccionados?"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Você não pode modificar a data de validade de uma chave v3\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "seleccionar o identificador do utilizador como primário"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "lista preferências (perito)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "lista preferências (detalhadamente)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"Realmente actualizar as preferências para os utilizadores seleccionados?"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"Realmente actualizar as preferências para os utilizadores seleccionados?"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "muda a frase secreta"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "muda os valores de confiança"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar um ID de utilizador"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoga uma chave secundária"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "activa uma chave"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "desactiva uma chave"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostrar identificador fotográfico"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Chave secreta disponível.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta é necessária para fazer isto.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4321,295 -3361,241 +4261,305 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "A chave está revogada."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realmente assinar todos os IDs de utilizador? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Realmente assinar todos os IDs de utilizador? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe de assinatura desconhecida"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Este comando não é permitido no modo %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Você não pode remover o último ID de utilizador!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Realmente remover este ID de utilizador? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realmente remover este ID de utilizador? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Você deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Você deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Você quer realmente remover as chaves selecionadas? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Você quer realmente remover esta chave? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realmente revocar este ID de utilizador? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Você quer realmente revogar esta chave? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Você quer realmente revogar as chaves selecionadas? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Você quer realmente revogar esta chave? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "configurar lista de preferências"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Realmente actualizar as preferências para os utilizadores seleccionados?"
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realmente actualizar as preferências?"
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Gravar alterações? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Sair sem gravar? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "actualização falhou: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Você não pode remover o último ID de utilizador!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "verificação da assinatura criada falhou: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "verificação da assinatura criada falhou: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: versão de ficheiro inválida %d\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valor inválido\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s não é um conjunto de caracteres válido\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "chave `%s' não encontrada: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "'Digest': "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Características: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notação: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Esta chave pode ser revogada pela chave %s "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Esta chave pode ser revogada pela chave %s "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr " (sensível)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossível criar %s: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "revkey"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confiança: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confiança: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4617,36 -3603,27 +4567,36 @@@ msgstr "
"Não se esqueça que a validade de chave mostrada não é necessáriamente a\n"
"correcta a não ser que reinicie o programa.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Você não pode modificar a data de validade de uma chave v3\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4655,36 -3632,28 +4605,36 @@@ msgstr "
"AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n"
" algumas versão do PGP podem rejeitá-la.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Apagar esta assinatura válida? (s/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Apagar esta assinatura inválida? (s/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4692,38 -3661,31 +4642,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d assinatura removida.\n"
msgstr[1] "%d assinatura removida.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "armadura inválida"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Utilizador \"%s\" está revocado."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Utilizador \"%s\" está revocado."
msgstr[1] "Utilizador \"%s\" está revocado."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o utilizador com o id \"%s\" já está revocado\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o utilizador com o id \"%s\" já está revocado\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4732,219 -3694,178 +4682,224 @@@ msgstr "
"AVISO: Esta chave é do tipo PGP 2.x. Se adicionar um revogador designado\n"
" algumas versão do PGP podem rejeitá-la.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Insira o ID de utilizador do revogador escolhido: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
#, fuzzy
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "A modificar a data de validade para uma chave secundária.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave primária.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Você não pode modificar a data de validade de uma chave v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Seleccione exactamente um identificador de utilizador.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Notação de assinatura: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Escrever por cima (s/N)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com índice %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nenhum ID de utilizador com índice %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nenhum ID de utilizador com índice %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nenhum ID de utilizador com índice %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de utilizador: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " assinado por %08lX em %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (não-exportável)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Tem a certeza de que quer revogá-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " assinado por %08lX em %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (não-exportável)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revogado por %08lX em %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Está prestes a revogar estas assinaturas:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente criar os certificados de revogação? (s/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o utilizador com o id \"%s\" já está revocado\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Você não pode remover o último ID de utilizador!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" já está revocado\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" já está revocado\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opções de importação inválidas\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "preferência %c%lu duplicada\n"
@@@ -5393,8 -4237,6 +5348,8 @@@ msgstr "
"geração dos números primos; isso dá ao gerador de números aleatórios\n"
"uma hipótese maior de ganhar entropia suficiente.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
@@@ -5468,7 -4297,6 +5423,7 @@@ msgstr "erro ao escrever no porta-chave
msgid "public and secret key created and signed.\n"
msgstr "chaves pública e privada criadas e assinadas.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5477,7 -4305,6 +5432,7 @@@ msgstr "
"Note que esta chave não pode ser usada para cifragem. Você pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5485,7 -4312,6 +5440,7 @@@ msgstr "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5493,51 -4319,40 +5448,51 @@@ msgstr "
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a criação de sub-chave para chaves v3 não respeito o OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave primária não disponíveis.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Componentes secretas da chave primária não disponíveis.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr ""
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politica de assinatura crítica: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politica de assinatura: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Notação de assinatura crítica: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Notação de assinatura: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5545,7 -4360,20 +5500,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d assinaturas incorrectas\n"
msgstr[1] "%d assinaturas incorrectas\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d assinaturas incorrectas\n"
+ msgstr[1] "%d assinaturas incorrectas\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 assinatura não verificada por falta de chave\n"
+ msgstr[1] "1 assinatura não verificada por falta de chave\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5553,41 -4381,33 +5524,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 assinatura não verificada devido a um erro\n"
msgstr[1] "1 assinatura não verificada devido a um erro\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Porta-chaves"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Impressão da chave primária:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Impressão da subchave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Impressão da chave primária:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Impressão da subchave:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impressão da chave ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5697,267 -4496,218 +5668,273 @@@ msgstr "chave `%s' não encontrada: %s\
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "opções de exportação inválidas\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com a sua chave %08lX em %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, fuzzy, c-format
msgid "%s encrypted session key\n"
msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrado com algoritmo desconhecido %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "a chave pública é %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "dados cifrados com chave pública: DEK válido\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ou \""
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado com chave %s, ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifragem de chave pública falhou: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, fuzzy, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Repita a frase secreta\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
#, fuzzy
msgid "encrypted with 1 passphrase\n"
msgstr "Repita a frase secreta\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "a assumir dados cifrados %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Cifra IDEO não disponível, a tentar utilizar %s em substituição\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "AVISO: a mensagem não tinha a sua integridade protegida\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "decifragem correcta\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro original='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Assinatura INCORRECTA de \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Assinatura expirada de \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "verificação de assinatura suprimida\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "não consigo tratar estas assinaturas múltiplas\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ou \""
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " ou \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
#, fuzzy
msgid "Key available at: "
msgstr "Nenhuma ajuda disponível"
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ou \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
+
++#: g10/mainproc.c:2194
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
#, fuzzy
msgid "binary"
msgstr "primary"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
#, fuzzy
msgid "unknown"
msgstr "versão desconhecida"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave pública desconhecido"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossível verificar assinatura: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "não é uma assinatura separada\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVISO: várias assinaturas detectadas. Apenas a primeira será verificada.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura de classe 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
@@@ -6019,68 -4758,55 +5996,68 @@@ msgstr "armadura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opção depreciada \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" é uma opção depreciada\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor utilize \"%s%s\" em vez dela\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
#, fuzzy
msgid "Uncompressed"
msgstr "não processado"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "não processado"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "a ler opções de `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatário por omissão desconhecido `%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "classe de assinatura desconhecida"
@@@ -6591,35 -5218,32 +6568,40 @@@ msgstr "impossível abrir dados assinad
msgid "can't open signed data fd=%d: %s\n"
msgstr "impossível abrir dados assinados `%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "chave %08lX: sem ID de utilizador\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinatário anónimo; a tentar chave secreta %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "certo, nós somos o destinatário anónimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "codificação antiga do DEK não suportada\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritmo de cifra %d%s é desconhecido ou foi desactivado\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6777,7 -5373,6 +6759,7 @@@ msgstr "
msgid "Is this okay? (y/N) "
msgstr "Usar esta chave de qualquer modo? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "chave fraca criada - tentando novamente\n"
@@@ -6798,40 -5390,38 +6780,46 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrar mais informações\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
msgstr[1] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
msgstr[1] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6844,7 -5434,6 +6832,7 @@@ msgstr[1] "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6856,41 -5445,34 +6844,41 @@@ msgstr[1] "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: a chave foi revogada"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"assumindo assinatura incorrecta na chave %08lX devido a um bit crítico "
"desconhecido\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "chave %08lX: sem subchave para o pacote revocação de subchave\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "chave %08lX: sem subchave para ligação de chaves\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVISO: impossível expandir-%% a url de política (demasiado grande). A "
"utilizar não expandida.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6898,7 -5480,6 +6886,7 @@@ msgstr "
"AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
"A utilizar não expandida.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6907,12 -5488,10 +6895,12 @@@ msgstr "
"AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
"A utilizar não expandida.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6920,30 -5499,24 +6908,30 @@@ msgstr "
"forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
"destinatário\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "a assinar:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "será utilizada a cifragem %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignorado `%s': duplicada\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "ignorado: a chave secreta já está presente\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7030,7 -5587,6 +7018,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "impossível fechar `%s': %s\n"
@@@ -7142,217 -5676,178 +7130,217 @@@ msgstr "impossível manipular linhas d
msgid "input line longer than %d characters\n"
msgstr "linha de entrada maior que %d caracteres\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmos suportados:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: erro ao escrever registo de diretório: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "lista chave e identificadores de utilizadores"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listar as chaves"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, 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:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
@@@ -7360,148 -5855,122 +7348,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d assinaturas removidas.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
msgid "Encrypted 0 messages."
msgstr "Repita a frase secreta\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Política: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7518,18 -5987,14 +7506,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7767,19 -6187,14 +7755,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7828,44 -6234,35 +7816,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "remover chaves do porta-chaves público"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
@@@ -7873,54 -6270,43 +7861,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "muda a frase secreta"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7930,26 -6316,21 +7918,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "muda a frase secreta"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "muda a frase secreta"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "motivo da revocação: "
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7957,117 -6338,93 +7945,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "muda a frase secreta"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "muda a frase secreta"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "erro na leitura do bloco de chave: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler registo livre: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "%s' já comprimido\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "gerar um novo par de chaves"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "gerar um novo par de chaves"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI não suportado"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "A geração de chaves falhou: %s\n"
msgstr[1] "A geração de chaves falhou: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@@ -8088,11 -6442,9 +8076,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
@@@ -8148,12 -6489,10 +8136,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8228,9 -6552,6 +8216,9 @@@ msgstr "erro na criação da frase secr
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
@@@ -8417,7 -6698,6 +8405,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8463,7 -6736,6 +8451,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@@ -8727,11 -6946,9 +8715,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8760,141 -6972,110 +8748,141 @@@ msgstr "preferência %c%lu duplicada\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "resposta do agente inválida\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "listar as chaves secretas"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "certificado incorrecto"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "certificado incorrecto"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "certificado incorrecto"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "criar saída com armadura ascii"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "modo não-interactivo: nunca perguntar"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "assumir não para a maioria das perguntas"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr ""
"adicionar este porta-chaves\n"
"à lista de porta-chaves"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8905,47 -7086,38 +8893,47 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a operação por omissão depende dos dados de entrada\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "impossível ligar a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "destinatário por omissão desconhecido `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = saltar esta chave\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "a escrever para `%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossível fechar `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9008,7 -7168,6 +8996,7 @@@ msgstr "rev? problema ao verificar revo
msgid "error storing flags: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9037,7 -7192,6 +9025,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9051,51 -7204,41 +9039,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "algoritmo de protecção %d%s não é suportado\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "verificação da assinatura criada falhou: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Esta assinatura expirou em %s.\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Assinatura correcta de \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " ou \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9894,116 -7876,88 +9882,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Sair sem gravar? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10016,91 -7970,72 +10004,91 @@@ msgstr "
"@\n"
"(Veja a página man para uma lista completa de comandos e opções)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opções] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s não é permitido com %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "frase secreta demasiado longa\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: versão de ficheiro inválida %d\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "armadura: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "não processado"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10282,7 -8181,14 +10270,18 @@@ msgstr "%s: não é um base de dados d
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "erro na leitura de `%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -10347,12 -8241,10 +10346,12 @@@ msgstr "a procurar por \"%s\" no servid
msgid "malloc failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10416,12 -8296,6 +10415,7 @@@ msgstr "erro na escrita do porta-chave
msgid "error reading HTTP response for '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "erro na leitura de `%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@@ -10539,77 -8389,61 +10533,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossível criar `%s': %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: falha ao criar tabela de dispersão: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10746,195 -8551,148 +10740,195 @@@ msgstr "assinatura falhou: %s\n
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usar mode de frase secreta N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erro na criação da frase secreta: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifrar para NOME"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "erro na rede"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "frase secreta incorrecta"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "chave pública não encontrada"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "erro na leitura de `%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -11007,27 -8749,22 +11001,27 @@@ msgstr "usar como ficheiro de saída
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "chave pública não encontrada"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "a escrever chave privada para `%s'\n"
diff --cc po/ro.po
index f0127f9,0cf134b..7d49174
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -19,7 -18,6 +19,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "am eşuat să stochez amprenta: %s\n"
@@@ -30,41 -28,32 +30,41 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "frază-parolă invalidă
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
#, fuzzy
msgid "Quality:"
msgstr "validitate: %s"
@@@ -83,17 -71,14 +83,17 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
@@@ -101,58 -86,45 +101,58 @@@
msgstr ""
"Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "frază-parolă incorectă"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "linie prea lungă"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "frază-parolă prea lungă\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Caracter invalid în nume\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "MPI incorect"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "frază-parolă incorectă"
@@@ -162,84 -133,57 +162,84 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "schimbă fraza-parolă"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -247,75 -191,61 +247,75 @@@
msgstr ""
"Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: am eşuat să creez hashtable: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
#, fuzzy
msgid "Please insert the card with serial number"
msgstr ""
"Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
" %.*s\n"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
"Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
" %.*s\n"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
#, fuzzy
msgid "Admin PIN"
msgstr "|A|PIN Admin"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repetaţi acest PIN: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Repetaţi acest PIN: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repetaţi acest PIN: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
@@@ -394,8 -311,6 +394,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "schimbă fraza-parolă"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -405,124 -320,95 +405,128 @@@ msgstr "
"Opţiuni:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Cheia este înlocuită"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "locvace"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "fii oarecum mai tăcut"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "caută pentru chei pe un server de chei"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizează baza de date de încredere"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nu este suportat(ă)"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -531,180 -417,137 +535,185 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "algoritm rezumat selectat este invalid\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nu este disponibil în această sesiune\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizarea a eşuat: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
msgstr "director `%s' creat\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) a eşuat în %s: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a eşuat: %s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: sărită: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -712,9 -555,6 +721,9 @@@ msgstr "
"@Comenzi:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -771,8 -603,6 +780,8 @@@ msgstr "anulată
msgid "error while asking for the passphrase: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eroare în `%s': %s\n"
@@@ -831,8 -652,6 +840,8 @@@ msgstr "
msgid "Yes"
msgstr "da"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -883,7 -695,6 +892,7 @@@ msgstr "schimbă fraza-parolă
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -891,13 -702,11 +900,13 @@@
"%%0A?"
msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "activează cheia"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -917,7 -723,6 +926,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "verificarea semnăturii create a eşuat: %s\n"
@@@ -958,8 -753,6 +967,8 @@@ msgstr "eroare la crearea frazei-parol�
msgid "error creating a stream for a pipe: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -1087,7 -854,6 +1096,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@@ -1102,7 -866,6 +1111,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1218,8 -958,6 +1227,8 @@@ msgstr "%s: inelul de chei creat\n
msgid "algorithm: %s"
msgstr "validitate: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1412,7 -1112,6 +1421,7 @@@ msgstr "opţiuni enumerare invalide\n
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "opţiuni enumerare invalide\n"
@@@ -1437,7 -1132,6 +1446,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "neforţat(ă)"
@@@ -1496,8 -1179,6 +1505,8 @@@ msgstr "cheia publică %s nu a fost gă
msgid "waiting for lock %s...\n"
msgstr "scriu cheia secretă în `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1629,7 -1284,6 +1638,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTISMENT: am găsit date de notare invalide\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1638,35 -1291,33 +1647,42 @@@
msgid "Enter passphrase: "
msgstr "Introduceţi fraza-parolă: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "AVERTISMENT: "
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s nu merge încă cu %s!\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "cardul OpenPGP nu e disponibil: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru în modul batch\n"
@@@ -1675,15 -1325,10 +1691,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Această comandă nu este permisă în modul %s.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "părţi ale cheii secrete nu sunt disponibile\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Selecţia d-voastră? "
@@@ -1740,147 -1372,100 +1756,132 @@@ msgstr "Eroare: Nume combinat prea lun
msgid "URL to retrieve public key: "
msgstr "URL pentru a aduce cheia publică: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Date login (nume cont): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Date DO personale: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Preferinţe limbă: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Eroare: lungime invalidă pentru şir preferinţe.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Eroare: caractere invalide în şir preferinţe.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sex ((M)asculin, (F)eminin sau spaţiu): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Eroare: răspuns invalid.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "Amprenta CA: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Eroare: amprentă formatată invalid.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "operaţia pe cheie nu e posibilă: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "nu este un card OpenPGP"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Înlocuiesc cheia existentă? (d/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Ce lungime de cheie doriţi? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Ce lungime de cheie doriţi? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Ce lungime de cheie doriţi? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rotunjită prin adaos la %u biţi\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "dimensiunile cheii %s trebuie să fie în intervalul %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Creez copie de rezervă a cheii de cifrare în afara cardului? (d/N) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "cheia secretă deja stocată pe un card\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Înlocuiesc cheile existente? (d/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1895,167 -1480,123 +1896,167 @@@ msgstr "
" PIN = `%s' PIN Admin = `%s'\n"
"Ar trebui să le schimbaţi folosind comanda --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Vă rugăm selectaţi tipul de cheie de generat:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Cheie de semnare\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Cheie de cifrare\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Cheie de autentificare\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Selecţie invalidă.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Vă rugăm selectaţi unde să fie stocată cheia:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "actualizarea a eşuat: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Această comandă nu este permisă în modul %s.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "cheia secretă deja stocată pe un card\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Doriţi să-l semnaţi? (d/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "ieşi din acest meniu"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "arată comenzi administrare"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "afişează acest mesaj"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "afişează toate datele disponibile"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "schimbă numele purtătorului cardului"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "schimbă URL-ul de unde să fie adusă cheia"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "adu cheia specificată de URL-ul de pe card"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "schimbă numele de login"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "schimbă preferinţele de limbă"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "schimbă sexul purtătorului cardului"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "schimbă o amprentă CA"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "comută fanionul PIN de forţare a semnăturii"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "generează noi chei"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "meniu pentru a schimba sau debloca PIN-ul"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "verifică PIN-ul şi listează toate datele"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Comandă numai-administrare\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Sunt permise comenzi administrare\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Nu sunt permise comenzi administrare\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Comandă invalidă (încercaţi \"ajutor\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru această comandă\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eroare la citire keyblock: %s\n"
@@@ -2117,39 -1646,32 +2118,39 @@@ msgstr "
"folosiţi opţiunea \"--delete-secret-keys\" pentru a o şterge pe aceasta mai "
"întâi.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "nu pot crea un pachet ESK simetric datorită modului S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "folosesc cifrul %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' deja compresat\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVERTISMENT: `%s' este un fişier gol\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "citesc din `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2157,7 -1679,15 +2158,19 @@@ msgstr "
"AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
"destinatarului\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2166,38 -1696,32 +2179,39 @@@ msgstr "
"AVERTISMENT: forţând algoritmul de compresie %s (%d) violaţi preferinţele "
"destinatarului\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "forţând cifrul simetric %s (%d) violaţi preferinţele destinatarului\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrat pentru: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s date cifrate\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrat cu un algoritm necunoscut %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVERTISMENT: mesajul a fost cifrat cu o cheie slabă din cifrul simetric.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problemă cu mânuirea pachetului cifrat\n"
@@@ -2287,39 -1794,30 +2301,39 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: sărită: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "scriu în `%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "exportul cheilor secrete nu este permis\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "cheia %s: cheie stil PGP 2.x - sărită\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2388,233 -1873,185 +2402,238 @@@ msgstr "|NUME|foloseşte NUME ca cheie
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opţiuni enumerare invalide\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "|[fişier]|crează o semnătură"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fişier]|crează o semnătură text în clar"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "crează o semnătură detaşată"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "cifrează datele"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "cifrează numai cu cifru simetric"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "decriptează datele (implicit)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verifică o semnătură"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "enumeră chei"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "enumeră chei şi semnături"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "enumeră şi verifică semnăturile cheii"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "enumeră chei şi amprente"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "enumeră chei secrete"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "generează un certificat de revocare"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "şterge chei de pe inelul de chei public"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "şterge chei de pe inelul de chei secret"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "semnează o cheie"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "semnează o cheie local"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "semnează o cheie"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "semnează o cheie local"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "semnează sau editează o cheie"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "schimbă fraza-parolă"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exportă chei"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exportă chei pentru un server de chei"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importă chei de la un server de chei"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "caută pentru chei pe un server de chei"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "actualizează toate cheile de la un server de chei"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importă/combină chei"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "afişează starea cardului"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "schimbă data de pe card"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "schimbă PIN-ul unui card"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "actualizează baza de date de încredere"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [fişiere]|afişează rezumate mesaje"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "crează ieşire în armură ascii"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NUME|cifrare pentru NUME"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, 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:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|setează nivel de compresie N (0 deactivează)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "foloseşte modul text canonic"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "întreabă înainte de a suprascrie"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "foloseşte comportament strict OpenPGP"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2622,7 -2059,6 +2641,7 @@@ msgstr "
"@\n"
"(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2652,13 -2088,11 +2671,13 @@@ msgstr "
" --list-keys [nume] arată chei\n"
" --fingerprint [nume] arată amprente\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2673,7 -2107,6 +2692,7 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"operaţiunea implicită depinde de datele de intrare\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2681,78 -2114,64 +2700,78 @@@ msgstr "
"\n"
"Algoritmuri suportate:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Cifru: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Compresie: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "folosire: gpg [opţiuni] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "comenzi în conflict\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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 -2179,6 +2779,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2770,7 -2188,6 +2789,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fişier "
"configurare `%s'\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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 -2195,6 +2797,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, 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 -2202,6 +2805,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2797,7 -2212,6 +2816,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fişier "
"configurare `%s'\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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 -2219,348 +2824,442 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, 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:1956
++#: g10/gpg.c:1961
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "opţiune necunoscută `%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Nu este o adresă de email validă\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opţiuni server de chei invalide\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "opţiuni server de chei invalide\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opţiuni import invalide\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "opţiuni import invalide\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "opţiuni enumerare invalide\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opţiuni export invalide\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "opţiuni export invalide\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opţiuni enumerare invalide\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "opţiuni enumerare invalide\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opţiuni verificare invalide\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "opţiuni verificare invalide\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execuţie ca %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opţiuni verificare invalide\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fişier core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s înlocuieşte %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie să fie mai mare decât 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferinţe implicite invalide\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferinţe cifrare personale invalide\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferinţe rezumat personale invalide\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferinţe compresie personale invalide\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge încă cu %s!\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "nu puteţi folosi algorimul de rezumat `%s' câtă vreme în modul %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, 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"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "nu puteţi folosi algoritmul de compresie `%s' câtă vreme în modul %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am eşuat să iniţializez TrustDB:%s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, 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:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "nu puteţi folosi --symmetric --encrypt câtă vreme în modul %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "nu puteţi folosi --symmetric --sign --encrypt câtă vreme în modul %s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei eşuată: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepţie server de chei eşuată: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie eşuat: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "căutare server de chei eşuată: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei eşuată: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a eşuat: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a eşuat: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eroare la obţinerea numărului serial: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semnături furnizat este invalid\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@@ -3270,7 -2571,6 +3272,7 @@@ msgstr "ia cheile de pe acest inel de c
msgid "make timestamp conflicts only a warning"
msgstr "dă numai un avertisment la conflicte de timestamp"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|scrie informaţii de stare în acest FD"
@@@ -3301,337 -2596,275 +3303,343 @@@ msgstr "Nici un ajutor disponibil
msgid "No help available for '%s'"
msgstr "Nici un disponibil disponibil pentru `%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizează baza de date de încredere"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizează baza de date de încredere"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "afişează amprenta cheii"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "cheie secretă de nefolosit"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "afişează amprenta cheii"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "bloc de tip %d sărit\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chei procesate până acum\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Număr total procesate: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " chei noi sărite: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " chei noi sărite: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " fără ID-uri utilizator: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " neschimbate: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " noi ID-uri utilizator: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " noi subchei: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " noi semnături: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noi revocări de chei: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chei secrete importate: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chei secrete neschimbate: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ne importate: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "semnături create până acum: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "AVERTISMENT: cheia %s conţine preferinţe pentru indisponibil\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": preferinţă pentru algoritm de cifrare %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": preferinţă pentru algoritm rezumat %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": preferinţă pentru algoritm compresie %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
"este puternic sugerat să vă actualizaţi preferinţele şi re-distribuiţi\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"această cheie pentru a avita probleme potenţiale de ne-potrivire de "
"algoritm\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "vă puteţi actualiza preferinţele cu: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "cheia %s: nici un ID utilizator\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "sărită \"%s\": %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "cheia %s: subcheia HPK coruptă a fost reparată\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "cheia %s: nici un ID utilizator valid\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "aceasta poate fi cauzată de o auto-semnătură ce lipseşte\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "cheia %s: cheia publică nu a fost găsită: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "cheia %s: cheie nouă - sărită\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "n-am găsit nici un inel de chei ce poate fi scris: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "cheia %s: cheia publică \"%s\" importată\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "cheia %s: nu se potriveşte cu copia noastră\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "cheia %s: nu pot găsi keyblock-ul original: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "cheia %s: \"%s\" 1 nouă semnătură\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "cheia %s: \"%s\" %d noi semnături\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "cheia %s: \"%s\" 1 nouă subcheie\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "cheia %s: \"%s\" %d noi subchei\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semnături\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semnături\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "cheia %s: \"%s\" nu a fost schimbată\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "cheia %s: cheie secretă importată\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "sărită: cheia secretă deja prezentă\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "importul de chei secrete nu este permis\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "cheia %s: cheie secretă cu cifru invalid %d - sărită\n"
@@@ -3646,142 -2879,115 +3654,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"cheia %s: nici o cheie publică - nu pot aplica certificatul de revocare\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "cheia %s: nici un ID utilizator pentru semnătură\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"cheia %s: algoritm cu cheie publică nesuportat pentru ID-ul utilizator \"%s"
"\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "cheia %s: auto-semnătură invalidă pentru ID-ul utilizator \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "cheia %s: legare subcheie invalidă\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "cheia %s: am şters multiple legături de subchei\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "cheia %s: revocare de subcheie invalidă\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "cheia %s: am şters multiple revocări de subcheie\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cheia %s: am sărit ID-ul utilizator \"%s\"\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "cheia %s: am sărit subcheia\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "cheia %s: semnătura nu poate fi exportată (clasa 0x%02X) - sărită\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "cheia %s: certificat de revocare într-un loc greşit - sărit\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "cheia %s: certificat de revocare invalid: %s - sărit\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "cheia %s: clasă de semnătură neaşteptată (0x%02X) - sărită\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTISMENT: cheia %s poate fi revocată: aduc revocarea cheii %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISMENT: cheia %s poate fi revocată: cheia de revocare %s nu este "
"prezentă.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %s: am adăugat certificatul de revocare \"%s\"\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
@@@ -3824,82 -3023,12 +3832,15 @@@ msgstr "eroare în `%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "am eşuat să reconstruiesc cache-ul inelului de chei: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocare]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[auto-semnătură]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "semnătură %s, algoritm rezumat %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "revoke signatures"
- msgid " (reordered signatures follow)"
- msgstr "revocă semnături"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
- msgid "key %s:\n"
- msgstr "sărită \"%s\": %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "ID utilizator \"%s\" a fost revocat."
- msgstr[1] "ID utilizator \"%s\" a fost revocat."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
- msgstr[1] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d semnături incorecte\n"
- msgstr[1] "%d semnături incorecte\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Semnătură bună din \"%s\""
- msgstr[1] "Semnătură bună din \"%s\""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3910,17 -3039,14 +3851,17 @@@ msgstr "
"pentru a verifica cheile altor utilizatori (folosind paşapoarte,\n"
"verificând amprentele din diferite surse, etc.)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Am o încredere marginală\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Am toată încrederea\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3930,52 -3056,40 +3871,52 @@@ msgstr "
"O adâncime mai mare de 1 permite ca cheia pe care o semnaţi să facă\n"
"semnături de încredere în numele d-voastră.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Vă rugăm să introduceţi domeniul de restricţionare al acestei semnături, sau "
"apăsaţi enter pentru niciunul.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent \"%s\"? (d/N)"
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Nu pot semna.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID utilizator \"%s\" este expirat."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID-ul utilizator \"%s\" poate fi semnat. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Doriţi să-l semnaţi? (d/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3984,11 -3098,9 +3925,11 @@@ msgstr "
"Auto-semnătura pe \"%s\"\n"
"este o semnătură stil PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Doriţi să o promovaţi la o auto-semnătură OpenPGP? (d/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3997,12 -3109,10 +3938,12 @@@ msgstr "
"Semnătura d-voastră curentă pe \"%s\"\n"
"a expirat.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Doriţi să creaţi o nouă semnătură pentru a o înlocui pe cea expirată? (d/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4011,43 -3121,34 +3952,43 @@@ msgstr "
"Semnătura d-voastră curentă pe \"%s\"\n"
"semnătură locală.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Doriţi să o promovaţi la o semnătură total exportabilă? (d/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" a fost deja semnată local de cheia %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" a fost deja semnată de cheia %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Doriţi să o semnaţi oricum din nou? (d/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nimic de semnat cu cheia %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Această cheie a expirat!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Această cheie va expira pe %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Doriţi ca semnătura d-voastră să expire în acelaşi timp? (D/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4058,33 -3159,27 +3999,33 @@@ msgstr "
"într-adevăr persoanei numite deasupra? Dacă nu ştiţi ce să răspundeţi,\n"
"introduceţi \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nu voi răspunde.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nu am verificat deloc.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Am făcut ceva verificări superficiale.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Am făcut verificări foarte atente.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Selecţia dvs.? (introduceţi `?' pentru informaţii suplimentare): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4093,228 -3188,174 +4034,228 @@@ msgstr "
"Sunteţi într-adevăr sigur(ă) că doriţi să semnaţi\n"
"această cheie cu cheia d-voastră \"%s\" (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Aceasta va fi o auto-semnătură.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-exportabilă.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-revocabilă.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Semnătura va fi marcată ca non-exportabilă.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Semnătura va fi marcată ca non-revocabilă.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Nu am verificat această cheie deloc.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Am verificat această cheie superficial.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Am verificat această cheie foarte atent.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Doriţi cu adevărat să semnaţi? (d/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "semnarea a eşuat: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Cheia are numai articole de cheie sau talon (stub) pe card - nici o frază "
"parolă de schimbat.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "salvează şi termină"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "afişează amprenta cheii"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Notare semnătură: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "enumeră chei şi ID-uri utilizator"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "selectează ID utilizator N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "selectează subcheia N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "verifică semnături"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"semnează ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
"relevante]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "semnează ID-urile utilizatorilor selectaţi local"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură de încredere"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură irevocabilă"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "adaugă un ID utilizator"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "adaugă o poză ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "şterge ID-urile utilizator selectate"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "adaugă o subcheie"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "adaugă o cheie la un smartcard"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "mută o cheie pe un smartcard"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "mută o cheie de rezervă pe un smartcard"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "şterge subcheile selectate"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "adaugă o cheie de revocare"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "şterge semnăturile de pe ID-urile utilizator selectate"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "schimbă data de expirare pentru cheia sau subcheile selectate"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "marchează ID-ul utilizator selectat ca primar"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "enumeră preferinţele (expert)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "afişează preferinţele (detaliat)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"setează URL-ul serverului de chei preferat pentru ID-urile utilizator "
"selectate"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "schimbă fraza-parolă"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "schimbă încrederea pentru proprietar"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "revocă semnăturile pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "revocă ID-urile utilizator selectate"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "revocă cheia sau subcheile selectate"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "activează cheia"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "deactivează cheia"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "arată pozele pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Cheia secretă este disponibilă.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Aveţi nevoie de cheia secretă pentru a face aceasta.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4333,288 -3374,236 +4274,300 @@@ msgstr "
" pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
" (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Cheia este revocată."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugestie: Selectaţi ID-ul utilizator de semnat\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Tip de semnătură necunoscut `%s'\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Această comandă nu este permisă în modul %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Trebuie mai întâi să selectaţi cel puţin un ID utilizator.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Ştergeţi într-adevăr toate ID-urile utilizator selectate? (d/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Ştergeţi într-adevăr acest ID utilizator? (d/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Mutaţi într-adevăr cheia primară? (d/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Trebuie să selectaţi exact o cheie.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Comanda aşteaptă un nume de fişier ca argument\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Nu pot deschide `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Eroare citind cheia de rezervă de pe `%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Trebuie să selectaţi cel puţin o cheie.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Doriţi într-adevăr să ştergeţi această cheie? (d/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Doriţi într-adevăr să revocaţi toate ID-urile utilizator selectate? (d/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Doriţi într-adevăr să revocaţi acest ID utilizator? (d/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Doriţi într-adevăr să revocaţi toată cheia? (d/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Doriţi într-adevăr să revocaţi subcheile selectate? (d/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Doriţi într-adevăr să revocaţi această subcheie? (d/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Încrederea proprietar nu poate fi setată când este folosită o bază de date "
"de încredere furnizată de utilizator\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Setează lista de preferinţe ca:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Doriţi într-adevăr să actualizaţi preferinţele pentru ID-urile utilizator "
"selectate? (d/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Doriţi într-adevăr să actualizaţi preferinţele? (d/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Salvaţi schimbările? (d/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Terminaţi fără a salva? (d/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "actualizarea a eşuat: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Cheia nu a fost schimbată aşa că nici o actualizare a fost necesară.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "verificarea semnăturii create a eşuat: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "verificarea semnăturii create a eşuat: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "amprentă invalidă"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "am eşuat să stochez amprenta: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valoare invalidă\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nu există acest ID utilizator.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Nimic de semnat cu cheia %s\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "invalid fingerprint"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "amprentă invalidă"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "cheia \"%s\" nu a fost găsită: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Rezumat: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Capabilităţi: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Server de chei no-modify"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Server de chei preferat: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notaţie:"
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Nu există nici o preferinţă pentru un ID utilizator stil PGP 2.x.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Această cheie a fost revocată pe %s de %s cheia %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Această cheie poate fi revocată de %s cheia %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr " (senzitiv)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "creată: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "revocată: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "expirată: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "expiră: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "folosire: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "nr-card: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "încredere: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "validitate: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Această cheie a fost deactivată"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4623,18 -3612,12 +4576,18 @@@ 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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "expirată"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4643,17 -3626,14 +4596,17 @@@ msgstr "
" Această comandă poate cauza ca un alt ID utilizator\n"
" să devină ID-ul utilizator primar presupus.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4662,35 -3642,27 +4615,35 @@@ msgstr "
"AVERTISMENT: Aceasta este o cheie stil PGP2. Adăugarea unei poze ID poate\n"
" cauza unele versiuni de PGP să respingă această cheie.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sunteţi încă sigur(ă) că doriţi să o adăugaţi? (d/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nu puteţi adăuga o poză ID la o cheie stil PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Ştergeţi această semnătură bună? (d/N/t)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4698,37 -3670,30 +4651,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Am şters %d semnături.\n"
msgstr[1] "Am şters %d semnături.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nu am şters nimic.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "invalid(ă)"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "ID utilizator \"%s\" a fost revocat."
msgstr[1] "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4738,40 -3703,32 +4691,40 @@@ msgstr "
" desemnat poate face ca unele versiuni de PGP să respingă "
"cheia.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Nu puteţi adăuga un revocator desemnat la o cheie stil PGP 2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "nu puteţi desemna o cheie ca propriul său revocator desemnat\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "această cheie a fost deja desemnată ca un revocator\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
"anulată!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
"desemnat? (d/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4782,178 -3739,145 +4735,183 @@@ msgstr "
"Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
"desemnat? (d/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Schimb timpul de expirare pentru o subcheie.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Schimb timpul de expirare pentru cheia primară.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
"certified)\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "auto-semnătură v3 sărită pentru ID-ul utilizator \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Introduceţi URL-ul serverului de chei preferat: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Notare semnătură: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Suprascriu? (d/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nici un ID utilizator cu indicele %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Nici un ID utilizator cu hash-ul %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "Nici o subcheie cu indicele %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Nici o subcheie cu indicele %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID utilizator: \"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "semnată de cheia d-voastră %s la %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (non-exportabilă)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Această semnătură a expirat pe %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sunteţi încă sigur(ă) că doriţi să o revocaţi? (d/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Creaţi un certificat de revocare pentru această semnătură? (d/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Aţi semnat aceste ID-uri utilizator pe cheia %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (non-revocabilă)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocată de cheia d-voastră %s pe %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Doriţi într-adevăr să creaţi certificatele de revocare? (d/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "nici o cheie secretă\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, fuzzy, c-format
#| msgid "revoke a user ID"
msgid "tried to revoke a non-user ID: %s\n"
msgstr "revocă un ID utilizator"
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVERTISMENT: o semnătură ID utilizator este datată %d secunde în viitor\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Cheia %s este deja revocată.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Subcheia %s este deja revocată.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Afişez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opţiuni enumerare invalide\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
@@@ -5394,8 -4241,6 +5352,8 @@@ msgstr "
"în timpul generării numerelor prime; aceasta dă o şansă generatorului de\n"
"numere aleatoare o şansă mai bună de a aduna destulă entropie.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a eşuat: %s\n"
@@@ -5472,7 -4304,6 +5430,7 @@@ msgstr "eroare la scrierea inelului de
msgid "public and secret key created and signed.\n"
msgstr "cheile secretă şi publică au fost create şi semnate.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5482,7 -4313,6 +5440,7 @@@ msgstr "
"să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
"pentru acest scop.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5490,7 -4320,6 +5448,7 @@@ msgstr "
"cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5498,49 -4327,38 +5456,49 @@@ msgstr "
"cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTĂ: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Părţile secrete ale cheii primare nu sunt disponibile.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Părţi secrete ale cheii primare sunt stacate pe card.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Creaţi într-adevăr? (d/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "niciodată "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politică de semnături critică: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politică de semnături: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Server de chei preferat critic: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Notare semnătură critică: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Notare semnătură: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5548,7 -4366,20 +5506,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d semnături incorecte\n"
msgstr[1] "%d semnături incorecte\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d semnături incorecte\n"
+ msgstr[1] "%d semnături incorecte\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
+ msgstr[1] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5556,40 -4387,32 +5530,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 semnătură nu a fost verificată din cauza unei erori\n"
msgstr[1] "1 semnătură nu a fost verificată din cauza unei erori\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Inel de chei"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Amprentă cheie primară:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Amprentă subcheie:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Amprentă cheie primară:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Amprentă subcheie:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Amprentă cheie ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Card nr. serie ="
@@@ -5700,265 -4502,217 +5674,272 @@@ msgstr "cheia nu a fost găsită pe ser
msgid "no keyserver known (use option --keyserver)\n"
msgstr "nici un server de chei cunoscut (folosiţi opţiunea --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "cer cheia %s de la serverul %s %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "cer cheia %s de la %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "nici o acţiune pentru serverul de chei!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "sărită \"%s\": %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "trimit cheia %s lui %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "cer cheia %s de la %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "dimensiune ciudată pentru o cheie de sesiune cifrată (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s cheie de sesiune cifrată\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "fraza-parolă generată cu un algoritm rezumat necunoscut %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "cheia publică este %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "date cigrate cu cheie publică: DEK bun\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrat cu cheia %u-bit %s, ID %s, creată %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrat cu cheia %s, ID %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decriptarea cu cheie publică a eşuat: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrată cu %lu fraze-parolă\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "cifrată cu 1 frază-parolă\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "presupunem date cifrate %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "cifru IDEA indisponibil, vom încerca să folosim %s în loc\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "AVERTISMENT: mesajul nu a avut integritatea protejată\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "decriptare OK\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "decriptarea a eşuat: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTĂ: expeditorul a cerut \"doar-pentru-ochii-d-voastră\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nume fişier original='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocare standalone - folosiţi \"gpg --import\" pentru a aplica\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Semnătură bună din \"%s\""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Semnătură INCORECTĂ din \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Semnătură expirată din \"%s\""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Semnătură bună din \"%s\""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "verificare semnătură eliminată\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "nu pot mânui aceste semnături multiple\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Semnătură făcută %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " folosind cheia %s %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Semnătură făcută %s folosind cheia %s cu ID %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " aka \"%s\""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Cheie disponibilă la: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[nesigur]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " aka \"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr ""
+ "AVERTISMENT: Această cheie nu este certificată de o semnătură de încredere!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Semnătură expirată %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Semnătura expiră %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "semnătură %s, algoritm rezumat %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binar"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "modtext"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "necunoscut"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritm pubkey necunoscut"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nu pot verifica semnătura: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "nu o semnătură detaşată\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVERTISMENT: am detectat multiple semnături. Numai prima va fi verificată.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "semnătură de sine stătătoare (standalone) de clasă 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "semnătură de stil vechi (PGP 2.x)\n"
@@@ -6020,69 -4763,56 +6001,69 @@@ msgstr "eroare citire în `%s': %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opţiune învechită \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "vă rugăm folosiţi \"%s%s\" în loc\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Necompresat"
#
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "necompresat|niciunul"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "opţiune ambiguă `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "opţiune necunoscută `%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6606,38 -5237,35 +6587,43 @@@ msgstr "nu pot deschide date semnate `%
msgid "can't open signed data fd=%d: %s\n"
msgstr "nu pot deschide date semnate `%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "cheia %s nu are nici un ID utilizator\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinator anonim; încerc cheia secretă %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "OK, noi suntem destinatarul anonim.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "vechea encodare a lui DEK nu este suportată\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"AVERTISMENT: algoritm cifrare %s nu a fost găsit în preferinţele "
"destinatarului\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTĂ: cheia secretă %s a expirat la %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6797,7 -5397,6 +6783,7 @@@ msgstr "(Nici o descriere dată)\n
msgid "Is this okay? (y/N) "
msgstr "Este aceasta OK? (d/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "cheie slabă creată - reîncerc\n"
@@@ -6816,30 -5412,30 +6802,36 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVERTISMENT: conflict pentru rezumat semnătură în mesaj\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
"certified)\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = arată-mi mai multe informaţii\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVERTISMENT: subcheia de semnare %s are o certificare-reciprocă invalidă "
"(invalid cross-certification)\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6847,7 -5443,6 +6839,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
msgstr[1] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6855,7 -5450,6 +6847,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
msgstr[1] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6870,7 -5464,6 +6862,7 @@@ msgstr[1] "
"cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
"ceasul)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6884,41 -5477,34 +6876,41 @@@ msgstr[1] "
"cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
"ceasul)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "NOTĂ: cheia semnăturii %s a expirat %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTĂ: cheia a fost revocată"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"presupun semnătură incorectă din cheia %s datorită unui bit critic "
"necunoscut\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "cheia %s: nici o subcheie pentru semnătura de revocare a subcheii\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "cheia %s: nici o subcheie pentru semnătura legată de subcheie\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVERTISMENT: nu pot %%-expanda notarea (prea mare). Folosesc neexpandat.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6926,7 -5512,6 +6918,7 @@@ msgstr "
"AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare). Îl folosesc "
"neexpandat.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6935,12 -5520,10 +6927,12 @@@ msgstr "
"AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare). Îl "
"folosesc neexpandat.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s semnătură de la: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6948,29 -5531,23 +6940,29 @@@ msgstr "
"AVERTISMENT: forţarea algoritmului rezumat %s (%d) violează preferinţele "
"destinatarului\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "semnare:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "va fi folosită cifrarea %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "sărită \"%s\": duplicată\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "sărită: cheia secretă deja prezentă\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"aceasta este o cheie ElGamal generată de PGP care nu e sigură pentru "
@@@ -7060,7 -5621,6 +7052,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7173,150 -5711,121 +7165,150 @@@ msgstr "nu pot mânui linii de text ma
msgid "input line longer than %d characters\n"
msgstr "linii de intrare mai lungi de %d caractere\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmuri suportate:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: eroare scriere înregistrare dir: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "eroare în `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "enumeră chei şi ID-uri utilizator"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politica: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "enumeră chei"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7324,68 -5833,58 +7316,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:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [fişiere]|afişează rezumate mesaje"
@@@ -7393,149 -5892,123 +7385,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Am şters %d semnături.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "cifrată cu %lu fraze-parolă\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Politica: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7552,18 -6025,14 +7544,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7804,19 -6228,14 +7796,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "modulus-ul RSA lipseşte sau nu are %d biţi\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, fuzzy, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "exponentul public RSA lipseşte sau are mai mult de %d biţi\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "apelul PIN a returnat eroare: %s\n"
@@@ -7865,44 -6275,35 +7857,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "am eşuat să stochez amprenta: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "am eşuat să stochez data creării: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "eroare la recuperarea stării CHV de pe card\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "răspunsul nu conţine modulul RSA\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "răspunsul nu conţine exponentul public RSA\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public key\n"
msgstr "răspunsul nu conţine exponentul public RSA\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "răspunsul nu conţine datele cheii publice\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "citirea cheii publice a eşuat: %s\n"
@@@ -7910,54 -6311,43 +7902,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verificarea CHV%d a eşuat: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "cardul este încuiat permanent!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7970,26 -6360,21 +7962,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "accesul la comenzile de administrare nu este configurată\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, fuzzy, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
@@@ -7997,82 -6382,64 +7989,82 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|PIN Admin Nou"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|PIN Nou"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "eroare la citirea datelor aplicaţiei\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "eroare la citirea amprentei DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "cheia există deja\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "cheia existentă va fi înlocuită\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "generez o nouă cheie\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "generez o nouă cheie\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "timestamp-ul de creare lipseşte\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "prime-ul RSA %s lipseşte sau nu are %d biţi\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "am eşuat să stochez cheia: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "URI nesuportat"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "vă rugăm aşteptaţi câtă vreme este creată noua cheie ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "generarea cheii a eşuat\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -8080,31 -6447,25 +8072,31 @@@ msgid_plural "key generation completed
msgstr[0] "generarea cheii este completă (%d secunde)\n"
msgstr[1] "generarea cheii este completă (%d secunde)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "semnătură %s, algoritm rezumat %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "semnături create până acum: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"verificarea PIN-ului Admin este deocamdată interzisă prin această comandă\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@@ -8126,11 -6484,9 +8118,11 @@@ msgstr "|N|PIN Nou
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
@@@ -8186,12 -6531,10 +8178,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8266,9 -6594,6 +8258,9 @@@ msgstr "eroare la obţinerea numărulu
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "citirea cheii publice a eşuat: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "am eşuat să stochez cheia: %s\n"
@@@ -8456,7 -6741,6 +8448,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8501,7 -6778,6 +8493,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
@@@ -8768,11 -6991,9 +8760,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8801,140 -7017,109 +8793,140 @@@ msgstr "preferinţa `%s' duplicată\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Nici o descriere dată)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "enumeră chei secrete"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "certificat incorect"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "certificat incorect"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "certificat incorect"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
#, fuzzy
msgid "register a smartcard"
msgstr "adaugă o cheie la un smartcard"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crează ieşire în armură ascii"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "nu folosi deloc terminalul"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "modul batch: nu întreba niciodată"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "presupune da la cele mai multe întrebări"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "presupune nu la cele mai multe întrebări"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "adaugă acest inel de chei la lista inelelor de chei"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NUME|foloseşte algoritm cifrare NUME"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NUME|foloseşte algoritm rezumat mesaj NUME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8945,48 -7130,39 +8937,48 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"operaţiunea implicită depinde de datele de intrare\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "nu mă pot conecta la `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "opţiune necunoscută `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Nici o descriere dată)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = sări peste cheia asta\n"
#
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "eroare la obţinerea numărului serial: %s\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9049,7 -7213,6 +9041,7 @@@ msgstr "rev? probleme la verificare rev
msgid "error storing flags: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9078,7 -7237,6 +9070,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9092,51 -7249,41 +9084,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "algoritm de protecţie %d%s nu este suportat\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "verificarea semnăturii create a eşuat: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Semnătură făcută %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "eroare la obţinerea numărului serial: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Semnătură bună din \"%s\""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " aka \"%s\""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr "Aceasta va fi o auto-semnătură.\n"
@@@ -9947,118 -7933,90 +9939,118 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Terminaţi fără a salva? (d/N) "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
#
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10071,95 -8029,76 +10063,95 @@@ msgstr "
"@\n"
"(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "folosire: gpg [opţiuni] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s nu este permis cu %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "linie prea lungă"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "amprentă invalidă"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "eroare citire în `%s': %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "neforţat(ă)"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10346,7 -8249,14 +10338,18 @@@ msgstr "`%s' nu este un fişier JPEG\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "eroare la citire `%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@@ -10413,12 -8311,10 +10416,12 @@@ msgstr "trimit cheia %s serverului %s %
msgid "malloc failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10483,12 -8367,6 +10486,7 @@@ msgstr "eroare la scrierea inelului de
msgid "error reading HTTP response for '%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "eroare la citire `%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@@ -10608,78 -8462,62 +10606,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "semnarea a eşuat: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "semnarea a eşuat: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "nu pot crea fişier de rezervă `%s': %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: am eşuat să creez hashtable: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "am eşuat să iniţializez TrustDB:%s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "am eşuat să stochez data creării: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10816,194 -8625,147 +10814,194 @@@ msgstr "semnarea a eşuat: %s\n
msgid "error sending standard options: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|foloseşte modul frază-parolă N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NUME|cifrare pentru NUME"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
#
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "eroare reţea"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "frază-parolă incorectă"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "cheia publică nu a fost găsită"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "eroare în `%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -11077,27 -8823,22 +11075,27 @@@ msgstr "foloseşte ca fişier ieşire
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "cheia publică nu a fost găsită"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "Nu sunt permise comenzi administrare\n"
diff --cc po/ru.po
index afa1574,8cca5f2..7a0ac65
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -22,7 -21,6 +22,7 @@@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "сбой при блокировке для ввода пароля: %s\n"
@@@ -33,45 -31,35 +33,45 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|Отмена (_C)"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr "|pinentry-label|Да (_Y)"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr "|pinentry-label|Нет (_N)"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|PIN:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr "|pinentry-label|Сохранить в диспетчере паролей (_S)"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Вы действительно хотите, чтобы фраза-пароль была видна на экране?"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr "|pinentry-tt|Показывать фразу-пароль"
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
msgid "|pinentry-tt|Hide passphrase"
msgstr "|pinentry-tt|Скрывать фразу-пароль"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Стойкость:"
@@@ -81,72 -69,56 +81,72 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Стойкость введенного выше текста. Проконсультируйтесь у администратора о "
"критериях оценки стойкости."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr "Введите PIN, чтобы сделать секретный ключ доступным в этом сеансе"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
"Введите фразу-пароль, чтобы сделать секретный ключ доступным в этом сеансе"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Фраза-пароль:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "не подходит - попробуйте еще раз"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (попытка %d из %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "Повторите:"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "Слишком длинный PIN"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Слишком длинная фраза-пароль"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Недопустимый символ в PIN"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "Слишком короткий PIN"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Неверный PIN"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Неверная фраза-пароль"
@@@ -155,56 -126,34 +155,56 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не могу создать '%s': %s\n"
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не могу открыть '%s': %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "обнаружена карта, серийный номер: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "на карте нет основного аутентификационного ключа для ssh: %s\n"
- #: agent/command-ssh.c:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "на карте не найдено подходящего ключа: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, c-format
msgid "error getting list of cards: %s\n"
msgstr "ошибка получения списка карт: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Позволить"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Отказать"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Повторите фразу-пароль:"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -239,63 -183,49 +239,63 @@@ msgstr "
"Введите фразу-пароль для защиты полученного секретного ключа%%0A %s%%0A "
"%s%%0Aвнутри хранилища ключей агента gpg"
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "сбой создания потока из сокета: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Вставьте карту с серийным номером"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Удалите текущую карту и вставьте карту с серийным номером"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Административный PIN"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "Код разблокировки PIN (PUK)"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Код сброса"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AВводите на клавиатуре считывателя."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Повторите код сброса"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Повторите ввод PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Повторите ввод PIN"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Код сброса повторен неверно; попробуйте еще раз"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK повторен неверно; попробуйте еще раз"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN повторен неверно; попробуйте еще раз"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Введите PIN%s%s%s для доступа к карте"
@@@ -380,8 -297,6 +380,8 @@@ msgstr "Введите фразу-па�
msgid "Please enter the new passphrase"
msgstr "Введите новую фразу-пароль"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -389,133 -304,97 +389,137 @@@ msgstr "
"@Параметры:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "запуск в режиме демона (фоновый режим)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "запуск в режиме сервера (нефоновый режим)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
msgid "run in supervised mode"
msgstr "запуск в подконтрольном режиме"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "сократить подробности"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "вывод команд в стиле sh"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "вывод команд в стиле csh"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FILE|взять параметры из файла FILE"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "не отсоединяться от консоли"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "не захватывать клавиатуру и мышь"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "использовать файл журнала для сервера"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|использовать программу PGM для ввода паролей"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|использовать программу PGM как демон криптографических карт"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "не использовать демон криптографических карт"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|принимать некоторые команды по NAME"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "игнорировать запросы смены терминала"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "игнорировать запросы смены дисплея XWindow"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|сбрасывать запомненный PIN через N секунд"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "не использовать запомненный PIN при подписывании"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "disallow the use of an external password cache"
msgstr "не позволять пользоваться внешней памятью паролей"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "не позволять клиентам помечать ключи как \"доверенные\""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "разрешить предустанавливать фразу-пароль"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
"не позволять вызывающей программе замещать собой программу ввода пароля"
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr "разрешить ввод фразы-пароля через Emacs"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "включить поддержку ssh"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Вызов: @GPG_AGENT@ [параметры] (-h для подсказки)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -523,144 -402,110 +527,149 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
"Управление секретными ключами для @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "запрошен недопустимый уровень отладки '%s'\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "выбрана недопустимая хеш-функция\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметров '%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "чтение параметров из '%s'\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Замечание: '%s' не считается параметром\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "слишком длинное имя сокета '%s'\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "ошибка получения разового кода для сокета\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "ошибка связывания сокета с '%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не удалось задать права доступа для '%s': %s\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "сбой listen(): %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
msgid "listening on socket '%s'\n"
msgstr "слушаем сокет '%s'\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 g10/openfile.c:398
+#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "создан каталог '%s'\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "сбой stat() для '%s': %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "невозможно использовать '%s' как домашний каталог\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
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:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s остановлен\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "в этом сеансе агент gpg не работает\n"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr ""
"Вызов: gpg-preset-passphrase [параметры] КОД_КЛЮЧА (-h для подсказки)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -668,8 -513,6 +677,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
"Работа с буфером паролей\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -677,9 -520,6 +686,9 @@@ msgstr "
"@Команды:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -733,8 -565,6 +742,8 @@@ msgstr "отменено\n
msgid "error while asking for the passphrase: %s\n"
msgstr "ошибка запроса ввода фразы-пароля: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "ошибка открытия '%s': %s\n"
@@@ -794,8 -615,6 +803,8 @@@ msgstr "
msgid "Yes"
msgstr "Да"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Нет"
@@@ -848,18 -660,15 +857,18 @@@ msgstr "Сменить фразу-па�
msgid "I'll change it later"
msgstr "Сменю позже"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "Удалить ключ"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -881,7 -687,6 +890,7 @@@ msgstr "%s ключ используе�
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "%zu-битный хеш недопустим для %u-битного ключа %s\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "сбой проверки созданной подписи: %s\n"
@@@ -919,8 -714,6 +928,8 @@@ msgstr "ошибка при созда�
msgid "error creating a stream for a pipe: %s\n"
msgstr "ошибка при создании потока для канала конвейера: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "ошибка при дублировании процесса: %s\n"
@@@ -1045,7 -812,6 +1054,7 @@@ msgstr "выход за предел б
msgid "out of core while allocating %lu bytes"
msgstr "выход за границы при размещении %lu байтов"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "ошибка выделения достаточной памяти: %s\n"
@@@ -1060,7 -824,6 +1069,7 @@@ msgstr "%s:%u: устаревший п�
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "неизвестный отладочный флаг '%s' игнорируется\n"
@@@ -1164,8 -904,6 +1173,8 @@@ msgstr "Сеансовый ключ с�
msgid "algorithm: %s"
msgstr "алгоритм: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "алгоритм (не поддерживается): %s"
@@@ -1331,7 -1031,6 +1340,7 @@@ msgstr "недопустимый пар
msgid "missing argument for option \"%.50s\"\n"
msgstr "не хватает аргумента для параметра \"%.50s\"\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "недопустимый аргумент для параметра \"%.50s\"\n"
@@@ -1356,7 -1051,6 +1365,7 @@@ msgstr "параметр \"%.50s\" не
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда \"%.50s\" неоднозначна\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "нехватка выделенной памяти\n"
@@@ -1414,8 -1097,6 +1423,8 @@@ msgstr "блокировка '%s' не
msgid "waiting for lock %s...\n"
msgstr "ожидаю снятия блокировки %s...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
@@@ -1536,7 -1191,6 +1545,7 @@@ msgstr "имя замечания до�
msgid "WARNING: invalid notation data found\n"
msgstr "Внимание: найдена недопустимая форма записи замечания\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "сбой при трансляции запроса %s клиенту\n"
@@@ -1545,33 -1198,31 +1554,40 @@@
msgid "Enter passphrase: "
msgstr "Введите фразу-пароль:"
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, c-format
msgid "error getting version from '%s': %s\n"
msgstr "ошибка получения версии из '%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr "сервер '%s' старше нас (%s < %s)"
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, c-format
msgid "WARNING: %s\n"
msgstr "Внимание: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s пока не работает совместно с %s!\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Карта OpenPGP недоступна: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "в пакетном режиме это действие невозможно\n"
@@@ -1579,14 -1229,9 +1595,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Эта команда доступна только для карт версии 2.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Код сброса (больше) не доступен\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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Ваш выбор? "
@@@ -1643,91 -1275,55 +1659,75 @@@ msgstr "Ошибка: Слишком д
msgid "URL to retrieve public key: "
msgstr "URL для получения открытого ключа: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
msgid "error reading '%s': %s\n"
msgstr "ошибка чтения '%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "ошибка записи '%s': %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Учетная запись (имя): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
- "Ошибка: Слишком длинные данные учетной записи (предел - %d символов).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Секретные данные DO:"
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Ошибка: Слишком много секретных данных DO (предел - %d символов).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Предпочтительный язык: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Пол ((M) мужской, (F) женский или пробел): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Ошибка: недопустимый ответ.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "отпечаток удостоверяющего центра: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Ошибка: недопустимый формат отпечатка.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "операция с ключом невозможна: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "это не карта OpenPGP"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "ошибка при считывании информации ключа: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Заменить существующий ключ? (y/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1737,55 -1333,43 +1737,55 @@@ msgstr "
" Если создать ключ не удастся, сверьтесь с документацией\n"
" на карту и выясните, какие размеры допустимы.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Какой Вам нужен размер ключа для подписей? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Какой Вам нужен размер ключа для шифрования? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлен до %u бит\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "размер ключей %s должен быть в пределах %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Теперь карта будет перенастроена на генерацию ключа длиной %u бит\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "ошибка изменения размера ключа %d до %u бит: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Сделать вне карты архивную копию ключа шифрования? (Y/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "Замечание: ключи уже хранятся на карте!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Заменить существующие ключи? (y/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1796,161 -1380,117 +1796,161 @@@ msgstr "
" PIN = '%s' Админ. PIN = '%s'\n"
"Вам следует изменить их командой --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Выберите тип создаваемого ключа:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Ключ подписи\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Ключ шифрования\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Ключ аутентификации\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Неправильный выбор.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Выберите, где хранить ключ:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "сбой записи ключа на карту: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
msgid "This command is not supported by this card\n"
msgstr "Данная команда этой картой не поддерживается.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Замечание: эта команда сотрет с карты все ключи!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
msgid "Continue? (y/N) "
msgstr "Продолжить? (y/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "выйти из этого меню"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "показать административные команды"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "показать данную справку"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "вывести все доступные данные"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "изменить имя держателя карты"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "изменить URL получения ключа"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "запросить ключ по заданному картой URL"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "изменить имя учетной записи"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "изменить языковые предпочтения"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "изменить пол держателя карты"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "сменить отпечаток удостоверяющего центра"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "переключить признак 'подпись требует PIN'"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "создать новые ключи"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "меню изменения или разблокировки PIN"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "проверить PIN и показать все данные"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "разблокировать PIN с помощью кода сброса"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr "уничтожить все ключи и данные"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Команды администрирования\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Команды администрирования разрешены\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Команды администрирования не разрешены\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Недопустимая команда (список команд: \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output для данной команды не работает\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
- #: 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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "ошибка чтения блока ключей: %s\n"
@@@ -2007,36 -1535,29 +2007,36 @@@ msgstr "имеется секретны
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "ошибка при создании фразы-пароля: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "не могу использовать симметричный пакет ESK из-за режима S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "используется симметричный шифр %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s' уже сжат\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Внимание: файл '%s' пуст\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "чтение из '%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2044,47 -1565,50 +2044,61 @@@ msgstr "
"Внимание: принудительное использование симметричного шифра %s (%d)\n"
" нарушает предпочтения получателя\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "Внимание: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"принудительное использование симметричного шифра %s (%d) нарушает "
"предпочтения получателя\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для пользователя \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "нельзя использовать %s в режиме %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "данные зашифрованы алгоритмом %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "зашифровано неизвестным алгоритмом %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"Внимание: сообщение было зашифровано слабым ключом симметричного шифра.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "проблема обработки зашифрованного пакета\n"
@@@ -2168,36 -1675,27 +2182,36 @@@ msgstr "при экспорте уда�
msgid "use the GnuPG key backup format"
msgstr "пользоваться архивным форматом ключей GnuPG"
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "сохраняю в '%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: материал ключа на карте - пропущен\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "экспорт секретных ключей не разрешен\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "Внимание: нечего экспортировать\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2264,215 -1749,167 +2278,220 @@@ msgstr "
msgid "all values passed to '%s' ignored\n"
msgstr "все значения, переданные в '%s', игнорируются\n"
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
"достоверным\n"
- #: g10/getkey.c:3637
++#: g10/getkey.c:3658
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо первичного ключа %s\n"
- #: g10/gpg.c:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "недопустимые значения для параметра \"%s\"\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "создать подпись"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "создать текстовую подпись"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "создать отделенную подпись"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "зашифровать данные"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "шифрование только симметричным шифром"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "проверить подпись"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "вывести список ключей"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "вывести список ключей и подписей"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "вывести список секретных ключей"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "быстро создать новую пару ключей"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
msgid "quickly add a new user-id"
msgstr "быстро добавить новый идентификатор пользователя"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly revoke a user-id"
msgstr "быстро отозвать идентификатор пользователя"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "quickly set a new expiration date"
msgstr "быстро установить новый срок действия"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "создание полноценной пары ключей"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "удалить ключи из таблицы секретных ключей"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "быстро подписать ключ"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "быстро подписать ключ локально"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "подписать ключ"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "подписать ключ локально"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "сменить фразу-пароль"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "экспортировать ключи"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "экспортировать ключи на сервер ключей"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "импортировать ключи с сервера ключей"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "искать ключи на сервере ключей"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "показать состояние карты"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "изменить данные на карте"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "сменить PIN карты"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "обновить таблицу доверия"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "вывести хеши сообщений"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "запуск в режиме сервера"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|установить правила TOFU для ключа"
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "вывод в текстовом формате"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифровать для пользователя USER-ID"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FILE|выводить данные в файл FILE"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "не делать никаких изменений"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2480,7 -1917,6 +2499,7 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. на странице man)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
msgid ""
"@\n"
"Examples:\n"
@@@ -2500,11 -1936,9 +2519,11 @@@ msgstr "
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2514,7 -1948,6 +2533,7 @@@ msgstr "
"Подписи и их проверка, шифрование и расшифровка\n"
"Действие по умолчанию зависит от входных данных\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2522,94 -1955,76 +2541,94 @@@ msgstr "
"\n"
"Поддерживаются следующие алгоритмы:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "С открытым ключом: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Симметричные шифры: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Хеш-функции: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "вызов: %s [параметры] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "в определении группы '%s' отсутствует знак =\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога,\n"
" содержащего модуль расширения '%s'\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему домашний каталог '%s'\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2617,449 -2032,340 +2636,435 @@@ msgstr "
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему файл настроек '%s'\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему файл модуля расширения '%s'\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "неизвестный элемент в файле настроек '%s'\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "показать в списке ключей фотоидентификаторы"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "показать в списке ключей сведения о назначении ключа"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "показать в списке подписей URL правил"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "показать в списке подписей все замечания"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "показать в списке подписей замечания стандарта IETF"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "показать в списке подписей пользовательские замечания"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "показать в списке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
"показать в списке ключей действительность идентификаторов пользователей"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показать в списке ключей отозванные и просроченные идентификаторы "
"пользователей"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "показать в списке ключей отозванные и просроченные подключи"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "показать в списке ключей название таблицы ключей"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "показать в списке подписей сроки действия"
- #: g10/gpg.c:2058 g10/gpg.c:2095
- #, c-format
- msgid "valid values for option '%s':\n"
- msgstr "недопустимые значения для параметра \"%s\"\n"
-
- #: g10/gpg.c:2069
++#: g10/gpg.c:2074
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "неизвестные правила TOFU '%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" выведет список вариантов)\n"
- #: g10/gpg.c:2105 g10/keygen.c:168
- #, c-format
- msgid "invalid value for option '%s'\n"
- msgstr "недопустимое значения для параметра \"%s\"\n"
-
- #: g10/gpg.c:2244
++#: g10/gpg.c:2227
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Замечание: %s не предназначен для нормального применения!\n"
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' - не допустимый срок действия подписи\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "\"%s\" не является адресом электронной почты\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "недопустимый режим ввода пароля '%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' - не допустимая таблица символов\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "не могу интерпретировать URL сервера ключей\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, c-format
msgid "invalid filter option: %s\n"
msgstr "недопустимый параметр фильтра: %s\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимые параметры списка\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "недопустимые параметры списка\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "показать при проверке подписи фотоидентификаторы"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "показать при проверке подписи URL правил"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "показать при проверке подписей все замечания"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "показать при проверке подписей замечания стандарта IETF"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "показать при проверке подписей пользовательские замечания"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr ""
"показать при проверке подписей действительность идентификаторов пользователей"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показать при проверке подписей отозванные и просроченные идентификаторы "
"пользователя"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr ""
"показать при проверке подписей только первичный идентификатор пользователя"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "проверить подписи по данным PKA"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "поднять доверие подписей по действительным данным PKA"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "Внимание: возможно создание файла образа памяти!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Внимание: %s отменяет %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s с %s недопустимо!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "Внимание: работаем с фальшивым системным временем: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм сжатия\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция для сертификации\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
- #: g10/gpg.c:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
- #: g10/gpg.c:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые личные предпочтения шифра\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "недопустимые личные предпочтения хеш-функции\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
- #: 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:3863
- #, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+ #, fuzzy, c-format
+ #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "хеш-функцию '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3868
- #, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+ #, fuzzy, c-format
+ #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверия: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "сбой симметричного шифрования '%s': %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
- #: g10/gpg.c:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "сбой при экспорте в виде ключа ssh: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из текстового формата: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в текстовый формат: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "недопустимая хеш-функция '%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr "Внимание: команда не отдана. Пытаюсь угадать, что имелось в виду ...\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Пишите сообщение ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочтительного сервера ключей неверен\n"
@@@ -3071,7 -2375,6 +3076,7 @@@ msgstr "|FILE|взять ключи и�
msgid "make timestamp conflicts only a warning"
msgstr "при несоответствии метки времени - только предупреждение"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить информацию в файл с дескриптором FD"
@@@ -3100,137 -2398,113 +3105,143 @@@ msgstr "Справки нет
msgid "No help available for '%s'"
msgstr "Нет справки для '%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "импортировать подписи, обозначенные как 'только локальные'"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "устранить при импорте повреждения от сервера ключей pks"
- #: g10/import.c:158
++#: g10/import.c:166
msgid "do not clear the ownertrust values during import"
msgstr "не сбрасывать уровни доверия владельцам после импорта"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "не обновлять таблицу доверия после импорта"
- #: g10/import.c:164
++#: g10/import.c:172
msgid "show key during import"
msgstr "показывать ключ во время импорта"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "обновлять только существующие ключи"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "удалить после импорта непригодные части ключа"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "удалить после импорта из ключа как можно больше"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr "применить фильтры импорта и немедленно экспортировать ключ"
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr "ожидать ключи в архивном формате GnuPG"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key during import"
+ msgid "repair keys on import"
+ msgstr "показывать ключ во время импорта"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропущен блок типа %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "обработано %lu ключей\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Всего обработано: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключей PGP-2: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " пропущено новых ключей: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без идентификатора пользователя: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " импортировано: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " неизмененных: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " новых идентификаторов пользователя: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " новых подключей: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " новых подписей: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " новых отзывов ключей: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " прочитано секретных ключей: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "импортировано секретных ключей: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " неизмененных секретных ключей: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не импортировано: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " очищено подписей: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " очищено идентификаторов пользователей: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3239,190 -2513,152 +3250,190 @@@ msgstr "
"Внимание: ключ %s содержит предпочтения для недоступных\n"
"алгоритмов для следующих идентификаторов пользователей:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": предпочитает шифр %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": предпочитает хеш-функцию %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": предпочитает алгоритм сжатия %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "крайне желательно, чтобы Вы обновили свои предпочтения и\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"распространили этот ключ во избежание возможных нестыковок алгоритмов\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: нет идентификатора пользователя\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "исключен фильтром импорта"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: повреждение подключа PKS исправлено\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"ключ %s: принят без самозаверенного идентификатора пользователя \"%s\"\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: нет действительных идентификаторов пользователя\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "может быть, из-за отсутствия самоподписи\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не найден открытый ключ: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новый ключ - пропущен\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "нет доступной для записи таблицы ключей: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "ошибка записи таблицы ключей '%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не совпадает с нашей копией\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: \"%s\" 1 новый идентификатор пользователя\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: \"%s\" %d новых идентификаторов пользователя\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: \"%s\" 1 новая подпись\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: \"%s\" %d новых подписей\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: \"%s\" 1 новый подключ\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: \"%s\" %d новых подключей\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: \"%s\" %d подпись очищена\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: \"%s\" %d подписей очищено\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: \"%s\" %d идентификатор пользователя очищен\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: \"%s\" %d идентификаторов пользователя очищено\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: \"%s\" не изменен\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: импортирован секретный ключ\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: секретный ключ уже имеется\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: ошибка отправки в агент: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "секретный ключ %s: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "импорт секретного ключа не допускается\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
@@@ -3437,141 -2673,114 +3448,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: нет идентификатора пользователя для подписи\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: алгоритм с открытым ключом у идентификатора пользователя \"%s\" не "
"поддерживается\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"ключ %s: неправильная самоподпись на идентификаторе пользователя \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: недействительная прямая подпись ключа\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: нет подключа для связывания ключей\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: недопустимая связь подключей\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: удалено многократное связывание подключей\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: нет подключа для отзыва ключа\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: неверный отзыв подключа\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: удален многократный отзыв подключей\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущен идентификатор пользователя \"%s\"\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущен подключ\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
"ключ %s: обнаружено дублирование идентификатора пользователя - объединены\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: добавлена прямая подпись ключа\n"
@@@ -3611,84 -2813,12 +3622,15 @@@ msgstr "ошибка открытия �
msgid "failed to rebuild keyring cache: %s\n"
msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[отзыв]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[самоподпись]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr ""
- "не удалось проверить подпись: алгоритм с открытым ключом %d не "
- "поддерживается: %s.\n"
-
- #: g10/keyedit.c:642
- #, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
-
- #: g10/keyedit.c:805
- msgid " (reordered signatures follow)"
- msgstr "(порядок подписей изменен)"
-
- #: g10/keyedit.c:918
- #, c-format
- msgid "key %s:\n"
- msgstr "ключ %s:\n"
-
- #: g10/keyedit.c:921
- #, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "%d повторная подпись удалена\n"
- msgstr[1] "%d повторные подписи удалены\n"
- msgstr[2] "%d повторных подписей удалено\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 подпись не проверена за отсутствием ключа\n"
- msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
- msgstr[2] "%d подписей не проверено за отсутствием ключа\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[1] "%d плохих подписи\n"
- msgstr[2] "%d плохих подписей\n"
-
- #: g10/keyedit.c:932
- #, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Порядок %d подписи изменен\n"
- msgstr[1] "Порядок %d подписей изменен\n"
- msgstr[2] "Порядок %d подписей изменен\n"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
- "Внимание: обнаружены ошибки, проверялись только самоподписи; для проверки "
- "всех подписей выполните '%s'.\n"
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3699,17 -2829,14 +3641,17 @@@ msgstr "
"достоверности ключей других пользователей (проверяет паспорт,\n"
"сверяет отпечатки ключей из разных источников и т.п.)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Доверяю ограниченно\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Полностью доверяю\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3719,53 -2846,41 +3661,53 @@@ msgstr "
"позволяет ключу, который Вы подписываете, делать подписи доверия\n"
"от Вашего имени.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Введите домен, ограничивающий использование данной подписи, или пустую "
"строку, если нет ограничений.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
"Идентификатор пользователя \"%s\" пропущен: это не текстовый идентификатор.\n"
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Идентификатор пользователя \"%s\" отозван."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Вы все равно хотите его подписать? (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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Не могу подписать.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Срок действия идентификатора пользователя \"%s\" истек."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Идентификатор пользователя \"%s\" не самозаверен."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Идентификатор пользователя \"%s\" можно подписать."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Подписать его? (y/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3774,11 -2889,9 +3716,11 @@@ msgstr "
"Самоподпись у \"%s\" -\n"
"это подпись типа PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Вы хотите преобразовать ее в самоподпись OpenPGP? (y/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3787,11 -2900,9 +3729,11 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"просрочена.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3800,44 -2911,35 +3742,44 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"является локальной.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Вы хотите преобразовать ее в полную экспортируемую подпись? (y/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" уже локально подписан ключом %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" уже подписан ключом %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Вы все равно хотите снова подписать его? (y/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нечего подписывать ключом %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Данный ключ просрочен!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Срок действия данного ключа истекает %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Вы хотите, чтобы Ваша подпись была действительна до того же времени? (Y/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3846,31 -2948,25 +3788,31 @@@ msgstr "
"Насколько хорошо Вы проверили, что ключ действительно принадлежит\n"
"указанному выше человеку? Если не знаете, что ответить, введите \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду отвечать.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Никакой проверки не было.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Была частичная проверка.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Проверка была очень тщательной.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш выбор? (введите '?' для получения информации): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3879,227 -2975,173 +3821,227 @@@ msgstr "
"Вы уверены, что хотите подписать этот ключ\n"
"своим ключом \"%s\" (%s)?\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Это будет самоподпись.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "Внимание: подпись не будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "Внимание: подпись не будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Подпись будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Подпись будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Этот ключ мной никак не проверялся.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Мной проведена поверхностная проверка этого ключа.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Этот ключ проверен мной очень тщательно.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Действительно подписать? (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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "подписать не удалось: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"В ключе только заготовка или элементы для карты -\n"
"фразы-пароля для изменения нет.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "сохранить и выйти"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "показать отпечаток ключа"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
msgid "show the keygrip"
msgstr "показать код ключа"
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "вывести список ключей и идентификаторов пользователя"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "выбрать идентификатор пользователя N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "выбрать подключ N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "проверка подписей"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"подписать выбранные идентификаторы пользователя [* описание команд см. ниже]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "локально подписать выбранные идентификаторы пользователя"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "подписать выбранные идентификаторы пользователя подписью доверия"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "подписать выбранные идентификаторы пользователя без возможности отзыва"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "добавить идентификатор пользователя"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "добавить фотоидентификатор"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "удалить выбранные идентификаторы пользователя"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "добавить подключ"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "добавить ключ на криптографическую карту"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "переместить ключ на криптографическую карту"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "переместить архивный ключ на криптографическую карту"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "удалить выбранные подключи"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "добавить ключ отзыва"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "удалить подписи с выбранных идентификаторов пользователя"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "сменить срок действия ключа или выбранных подключей"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "пометить выбранный идентификатор пользователя как первичный"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "список предпочтений (экспертам)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "список предпочтений (подробный)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr ""
"установить список предпочтений для выбранных идентификаторов пользователя"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"установить URL предпочтительного сервера ключей для выбранных "
"идентификаторов пользователя"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "установить замечание для выбранных идентификаторов пользователя"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "сменить фразу-пароль"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "изменить уровень доверия владельцу"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "отозвать подписи у выбранных идентификаторов пользователя"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "отозвать выбранные идентификаторы пользователя"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "отозвать ключ или выбранные подключи"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "подключить ключ"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "отключить ключ"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "показать выбранные фотоидентификаторы"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"сжать непригодные идентификаторы пользователей и удалить непригодные подписи "
"из ключа"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"сжать непригодные идентификаторы пользователей и удалить все подписи из ключа"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Секретный ключ доступен.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Для данного действия нужен секретный ключ.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4110,253 -3152,207 +4052,265 @@@ msgstr "
" 't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
" nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Ключ отозван."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Действительно подписать все идентификаторы пользователя? (y/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
msgid "Really sign all text user IDs? (y/N) "
msgstr ""
"Действительно подписать все текстовые идентификаторы пользователя? (y/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr ""
"Подсказка: Выберите идентификаторы пользователей, которые нужно подписать\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Неизвестный тип подписи '%s'\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Данная команда в режиме %s недопустима.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Вы должны выбрать хотя бы один идентификатор пользователя.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Команда '%s'.)\n"
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Вы не можете удалить последний идентификатор пользователя!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr ""
"Действительно удалить все выбранные идентификаторы пользователей? (y/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Действительно удалить этот идентификатор пользователя? (y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Действительно переместить первичный ключ? (y/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Команде нужен аргумент-имя файла\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не могу открыть '%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Ошибка чтения архивного ключа из '%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Действительно отозвать все выбранные идентификаторы пользователей? (y/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Действительно отозвать данный идентификатор пользователя? (y/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Вы действительно хотите отозвать данный подключ? (y/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Нельзя присваивать степень доверия, когда таблица доверия указана "
"пользователем\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Установить предпочтения в:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Действительно обновить предпочтения для выбранных идентификаторов "
"пользователей? (y/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Действительно обновить предпочтения? (y/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Сохранить изменения? (y/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Выйти без сохранения? (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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "сбой при обновлении: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не изменялся - обновление не нужно.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Вы не можете удалить последний идентификатор пользователя!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "сбой проверки списка доверия: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "сбой проверки списка доверия: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" - не отпечаток\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" - не первичный отпечаток\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "Недопустимый идентификатор пользователя '%s': %s\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "Нет подходящих идентификаторов пользователей."
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "Подписывать нечего.\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "'%s' - не допустимый срок действия\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "\"%s\" is not a fingerprint\n"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "\"%s\" - не отпечаток\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "ключ \"%s\" не найден\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Хеш: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Характеристики: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Не изменять на сервере"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Предпочтительный сервер ключей: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Замечания: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"В идентификаторе пользователя типа PGP 2.x не может быть предпочтений.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(особо важный)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr " создан: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr " отозван: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "просрочен с: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr " годен до: %s"
@@@ -4364,30 -3360,24 +4318,30 @@@
# perhaps this should be somewhere in help/man
# (S - подпись, C - сертификация, E - шифрование, A - аутентификация)
# too long for repeating messages.
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "назначение: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "номер карты: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "доверие: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "достоверность: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Данный ключ отключен"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4395,19 -3385,13 +4349,19 @@@ msgstr "
"Учтите, что показанная достоверность ключа может быть неверной,\n"
"пока Вы не перезапустите программу.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "просрочен"
# check it
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4416,15 -3400,12 +4370,15 @@@ msgstr "
" Эта команда может привести к тому, что первичным станет считаться\n"
" другой идентификатор пользователя.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "Возможно, надо поменять также срок действия.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4433,35 -3414,27 +4387,35 @@@ msgstr "
"Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
" в некоторых версиях PGP вызвать отбраковку ключа.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Вы уверены, что хотите добавить это? (y/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Удалить данную действительную подпись? (y/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Удалить данную недействительную подпись? (y/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Удалить данную неизвестную подпись? (y/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Действительно удалить данную самоподпись? (y/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
@@@ -4469,20 -3442,16 +4423,20 @@@ msgstr[0] "Удалена %d подпи
msgstr[1] "Удалены %d подписи.\n"
msgstr[2] "Удалено %d подписей.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Ничего не удалено.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "недопустимый"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Идентификатор пользователя \"%s\" сжат: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4490,17 -3459,14 +4444,17 @@@ msgstr[0] "Идентификатор �
msgstr[1] "Идентификатор пользователя \"%s\": %d подписи удалены\n"
msgstr[2] "Идентификатор пользователя \"%s\": %d подписей удалено\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Идентификатор пользователя \"%s\" уже минимизирован\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Идентификатор пользователя \"%s\": уже очищен\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4509,36 -3475,28 +4463,36 @@@ msgstr "
"Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
" может в некоторых версиях PGP вызвать выбраковку ключа.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Укажите идентификатор пользователя ключа, назначенного отзывающим: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "ключ не может быть назначен отзывающим самого себя\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "этот ключ уже назначен отзывающим\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
@@@ -4546,173 -3504,140 +4500,178 @@@ msgstr "
"Вы уверены, что хотите изменить срок действия сразу нескольких подключей? (y/"
"N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Смена срока действия подключа.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Смена срока действия первичного ключа.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Нельзя изменить срок действия ключа v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "подписывающий подключ %s уже перекрестно заверен\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Выберите ровно один идентификатор пользователя.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропуск самоподписи v3 на идентификаторе пользователя \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Введите URL предпочтительного сервера ключей: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Вы действительно хотите заменить его? (y/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Вы действительно хотите удалить его? (y/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Введите замечание: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Продолжить? (y/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Нет идентификатора пользователя с индексом %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Нет идентификатора пользователя с хешем %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Нет подключа с идентификатором ключа '%s'.\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Нет подключа с индексом %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Идентификатор пользователя: \"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "подписано Вашим ключом %s %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (неэкспортируемая)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Срок действия подписи истек %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Вы уверены, что хотите отозвать? (y/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Вами не подписано.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вы подписали эти идентификаторы пользователей на ключе %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (неотзываемая)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "отозвано Вашим ключом %s %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Вы отзываете следующие подписи:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Действительно создать сертификат отзыва? (y/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "нет секретного ключа\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr "попытка отзыва непользовательского идентификатора: %s\n"
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Идентификатор пользователя \"%s\" уже отозван\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"Внимание: подпись идентификатора пользователя датирована %d секундами в "
"будущем\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Вы не можете удалить последний идентификатор пользователя!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s уже отозван.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Подключ %s уже отозван.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоидентификатора %s размера %ld для ключа %s (uid %d)\n"
++#: g10/keygen.c:168
+ #, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "недопустимое значения для параметра \"%s\"\n"
+
+#: g10/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "предпочтение '%s' дублируется\n"
@@@ -5144,8 -3992,6 +5103,8 @@@ msgstr "
"случайных чисел больше возможностей получить достаточное количество "
"энтропии.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
@@@ -5217,7 -4050,6 +5176,7 @@@ msgstr "ошибка записи та�
msgid "public and secret key created and signed.\n"
msgstr "открытый и секретный ключи созданы и подписаны.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5225,7 -4057,6 +5184,7 @@@ msgstr "
"Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5233,7 -4064,6 +5192,7 @@@ msgstr "
"ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5241,47 -4071,36 +5200,47 @@@ msgstr "
"ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретные части первичного ключа отсутствуют.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретные части первичного ключа хранятся на карте.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "никогда "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Критические правила подписи: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Правила подписи: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Критический предпочтительный сервер ключей: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Критическое замечание к подписи: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Замечание к подписи: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
@@@ -5289,7 -4108,20 +5248,23 @@@ msgstr[0] "%d хорошая подпи
msgstr[1] "%d хороших подписи\n"
msgstr[2] "%d хороших подписей\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, c-format
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d плохая подпись\n"
+ msgstr[1] "%d плохих подписи\n"
+ msgstr[2] "%d плохих подписей\n"
+
++#: g10/keylist.c:482
+ #, c-format
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "%d подпись не проверена за отсутствием ключа\n"
+ msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
+ msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
+
++#: g10/keylist.c:487
#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
@@@ -5297,7 -4129,6 +5272,7 @@@ msgstr[0] "%d подпись не пр�
msgstr[1] "%d подписи не проверены из-за ошибки\n"
msgstr[2] "%d подписей не проверено из-за ошибки\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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"
@@@ -5305,33 -4136,26 +5280,33 @@@ msgstr[0] "Внимание: %lu клю
msgstr[1] "Внимание: %lu ключа пропущены из-за большого размера\n"
msgstr[2] "Внимание: %lu ключей пропущено из-за большого размера\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Таблица ключей"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Отпечаток первичного ключа:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Отпечаток первичного ключа:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Отпечаток ключа ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " серийный номер карты ="
@@@ -5441,254 -4244,205 +5416,260 @@@ msgstr "ключ не найден н�
msgid "no keyserver known (use option --keyserver)\n"
msgstr "не заданы серверы ключей (используйте --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "запрашиваю ключ %s с сервера %s %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "получение ключа %s с %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
msgid "no keyserver known\n"
msgstr "ни один сервер ключей не известен\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено \"%s\": %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "отправка ключа %s на %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "запрос ключа из '%s'\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Внимание: невозможно получить URI %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "сеансовый ключ зашифрован по %s\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "фраза-пароль создана с незнакомой хеш-функцией %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "открытый ключ - %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "зашифровано %u-битным ключом %s с идентификатором %s, созданным %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "зашифровано ключом %s с идентификатором %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "сбой расшифровки с открытым ключом: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "зашифровано %lu фразами-паролями\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "зашифровано одной фразой-паролем\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "предполагаются данные, зашифрованные по %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "шифр IDEA недоступен, попробую вместо него %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "Внимание: целостность сообщения не защищена\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "расшифровано нормально\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Внимание: зашифрованное сообщение было изменено!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "сбой расшифровки: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Замечание: отправитель запросил \"только между нами\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "первоначальное имя файла='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Внимание: наблюдается несколько текстов\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "подпись не найдена\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПЛОХАЯ подпись пользователя \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Просроченная подпись пользователя \"%s\""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Действительная подпись пользователя \"%s\""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "проверка подписи подавлена\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "не могу обработать эти неоднозначные данные подписи\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Подпись сделана %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " ключом %s с идентификатором %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Подпись сделана %s ключом %s с идентификатором %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, c-format
msgid " issuer \"%s\"\n"
msgstr " издатель \"%s\"\n"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Ключ доступен на: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[сомнительно]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " или \"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "Внимание: Данный ключ не заверен доверенной подписью!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Подпись просрочена %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Подпись действительна до %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "формат подписи: %s, хеш-функция %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "двоичный"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "текстовый"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "неизвестно"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не могу проверить подпись: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "не отделенная подпись\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "отдельная подпись класса 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "подпись старого типа (PGP 2.x)\n"
@@@ -5749,67 -4492,54 +5730,67 @@@ msgstr "(сообщенная ошиб�
msgid "(further info: "
msgstr "(дальнейшие сведения: "
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "используйте вместо этого \"%s%s\"\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"Внимание: команда \"%s\" не рекомендуется к употреблению - не применяйте ее\n"
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Без сжатия"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "без сжатия|без|none"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "данное сообщение может быть непригодно для %s\n"
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначный параметр '%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "неизвестный параметр '%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "неизвестный слабый хеш '%s'\n"
@@@ -6302,36 -4933,34 +6283,42 @@@ msgstr "не могу открыть п
msgid "can't open signed data fd=%d: %s\n"
msgstr "не могу открыть подписанные данные fd=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "сертификат не пригоден для шифрования\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "отлично, мы - анонимный получатель.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "старая кодировка DEK не поддерживается\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"Внимание: в списке предпочтений получателя алгоритм шифрования %s не найден\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Замечание: секретный ключ %s просрочен с %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "Замечание: ключ был отозван"
@@@ -6493,7 -5094,6 +6480,7 @@@ msgstr "(Пояснения отсут�
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "создан слабый ключ - повторение\n"
@@@ -6513,26 -5110,26 +6500,32 @@@ msgstr "ключ %s %s использу
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "Ключ %s %s требует %zu-битного или более длинного хеша (хеш %s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "Внимание: конфликт хешей подписей в сообщении\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "нельзя использовать %s в режиме %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "Внимание: подписывающий подключ %s не был перекрестно заверен\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "за подробностями обращайтесь к %s\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "Внимание: подписывающий подключ %s неправильно перекрестно заверен\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, 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"
@@@ -6540,7 -5137,6 +6533,7 @@@ msgstr[0] "открытый ключ %
msgstr[1] "открытый ключ %s на %lu секунды новее подписи\n"
msgstr[2] "открытый ключ %s на %lu секунд новее подписи\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, 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"
@@@ -6548,7 -5144,6 +6541,7 @@@ msgstr[0] "открытый ключ %
msgstr[1] "открытый ключ %s на %lu дня новее подписи\n"
msgstr[2] "открытый ключ %s на %lu дней новее подписи\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6564,7 -5159,6 +6557,7 @@@ msgstr[2] "
"ключ %s создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6579,40 -5173,33 +6572,40 @@@ msgstr[2] "
"ключ %s создан на %lu дней в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Замечание: срок действия подписавшего ключа %s истек %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Замечание: ключ для подписей %s отозван\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"подпись ключа %s считается плохой из-за неизвестного критического бита\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "ключ %s: нет подключа для отзывающей подписи подключа\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "ключ %s: нет подключа для подписи связи подключей\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"Внимание: не могу развернуть %% в замечании (слишком длинное).\n"
" Использую неразвернутым.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6620,7 -5207,6 +6613,7 @@@ msgstr "
"Внимание: не могу развернуть %% в URL правил (слишком длинный). Использую "
"неразвернутым.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6629,12 -5215,10 +6622,12 @@@ msgstr "
"Внимание: невозможно развернуть %% в URL предпочтительного сервера ключей "
"(слишком длинный). Использую неразвернутым.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "подпись %s/%s пользователя \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6642,31 -5226,25 +6635,31 @@@ msgstr "
"Внимание: использование хеш-функции %s (%d) нарушает предпочтения "
"получателя\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "подпись:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "будет использовано шифрование по %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не помечен как небезопасный - не могу использовать его с фальшивым "
"генератором случайных чисел!\n"
- #: g10/skclist.c:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено \"%s\": дубликат\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "пропущено: секретный ключ уже имеется\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
@@@ -6750,7 -5312,6 +6743,7 @@@ msgstr "слишком большая �
msgid "%s: directory does not exist!\n"
msgstr "%s: каталог не существует!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "нет доступа к '%s': %s\n"
@@@ -6859,80 -5398,62 +6852,80 @@@ msgstr "не могу обработа�
msgid "input line longer than %d characters\n"
msgstr "строка ввода длиннее %d символов\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "ошибка в начале операции с базой данных TOFU: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "ошибка записи изменения в базе данных TOFU: %s\n"
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "ошибка отката назад изменения в базе данных TOFU: %s\n"
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "версия базы данных TOFU (не поддерживается): %s\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "ошибка создания таблицы TOFU 'ultimately_trusted_keys': %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr "ошибка базы данных TOFU"
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "ошибка чтения базы данных TOFU: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "ошибка определения версии базы данных TOFU: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "ошибка инициализации базы данных TOFU: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "ошибка создания таблицы TOFU 'encryptions': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr "добавление столбца effective_policy в базу данных привязок: %s\n"
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "ошибка открытия базы данных TOFU '%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "ошибка обновления базы данных TOFU: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr "Адрес электронной почты \"%s\" используется с ключом %s впервые."
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, c-format
msgid "The email address \"%s\" is associated with %d key!"
msgid_plural "The email address \"%s\" is associated with %d keys!"
@@@ -6940,13 -5461,11 +6933,13 @@@ msgstr[0] "Адрес электрон�
msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами!"
msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами!"
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
" Поскольку правило привязки было 'автоматически', оно изменилось на "
"'спрашивать'."
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
@@@ -6955,26 -5474,21 +6948,26 @@@ msgstr "
"Укажите, пожалуйста, следует ли связать этот адрес электронной почты с "
"ключом %s или вы думаете, что кто-то выдает себя за \"%s\"."
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "ошибка при сборе идентификаторов других пользователей: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
msgid "This key's user IDs:\n"
msgstr "Идентификаторы пользователя этого ключа:\n"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, c-format
msgid "policy: %s"
msgstr "правило: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "ошибка сбора статистики подписей: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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"
@@@ -6982,16 -5496,13 +6975,16 @@@ msgstr[0] "Адрес электрон�
msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
- #: g10/tofu.c:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистика ключей с адресом электронной почты \"%s\":\n"
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
msgid "this key"
msgstr "этот ключ"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
@@@ -6999,7 -5510,6 +6992,7 @@@ msgstr[0] "Проверено %d соо
msgstr[1] "Проверены %d сообщения."
msgstr[2] "Проверено %d сообщений."
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
@@@ -7007,7 -5517,6 +7000,7 @@@ msgstr[0] "Зашифровано %d с
msgstr[1] "Зашифрованы %d сообщения."
msgstr[2] "Зашифровано %d сообщений."
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
@@@ -7015,7 -5524,6 +7008,7 @@@ msgstr[0] "Проверено %d соо
msgstr[1] "Проверены %d сообщения в будущем."
msgstr[2] "Проверено %d сообщений в будущем."
- #: g10/tofu.c:1839
++#: g10/tofu.c:1838
#, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
@@@ -7023,7 -5531,6 +7016,7 @@@ msgstr[0] "Зашифровано %d с
msgstr[1] "Зашифрованы %d сообщения в будущем."
msgstr[2] "Зашифровано %d сообщений в будущем."
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7031,7 -5538,6 +7024,7 @@@ msgstr[0] "Проверено сооб�
msgstr[1] "Проверено сообщений за %d прошедших дня: %d."
msgstr[2] "Проверено сообщений за %d прошедших дней: %d."
- #: g10/tofu.c:1859
++#: g10/tofu.c:1858
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7039,7 -5545,6 +7032,7 @@@ msgstr[0] "Зашифровано со�
msgstr[1] "Зашифровано сообщений за %d прошедших дня: %d."
msgstr[2] "Зашифровано сообщений за %d прошедших дней: %d."
- #: g10/tofu.c:1869
++#: g10/tofu.c:1868
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7047,7 -5552,6 +7040,7 @@@ msgstr[0] "Проверено сооб�
msgstr[1] "Проверено сообщений за %d прошедших месяца: %d."
msgstr[2] "Проверено сообщений за %d прошедших месяцев: %d."
- #: g10/tofu.c:1875
++#: g10/tofu.c:1874
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7055,7 -5559,6 +7048,7 @@@ msgstr[0] "Зашифровано со�
msgstr[1] "Зашифровано сообщений за %d прошедших месяца: %d."
msgstr[2] "Зашифровано сообщений за %d прошедших месяцев: %d."
- #: g10/tofu.c:1885
++#: g10/tofu.c:1884
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7063,7 -5566,6 +7056,7 @@@ msgstr[0] "Проверено сооб�
msgstr[1] "Проверено сообщений за %d прошедших года: %d."
msgstr[2] "Проверено сообщений за %d прошедших лет: %d."
- #: g10/tofu.c:1891
++#: g10/tofu.c:1890
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7071,12 -5573,10 +7064,12 @@@ msgstr[0] "Зашифровано со�
msgstr[1] "Зашифровано сообщений за %d прошедших года: %d."
msgstr[2] "Зашифровано сообщений за %d прошедших лет: %d."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr "Проверено сообщений в прошлом: %d."
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, c-format
msgid "Messages encrypted in the past: %d."
msgstr "Зашифровавно сообщений в прошлом: %d."
@@@ -7084,7 -5584,6 +7077,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:1920
++#: g10/tofu.c:1919
msgid "TOFU detected a binding conflict"
msgstr ""
"Обычно с конкретным адресом электронной почты связан только один ключ. "
@@@ -7096,39 -5595,31 +7089,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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
"(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr "Принимается исходное значение (\"неизвестно\").\n"
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr "Обнаружено повреждение базы данных TOFU.\n"
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, c-format
msgid "resetting keydb: %s\n"
msgstr "сброс базы данных ключей: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "ошибка установки правил привязки TOFU в %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "ошибка при смене правила TOFU: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7136,7 -5627,6 +7129,7 @@@ msgstr[0] "%lld~прошедший~го
msgstr[1] "%lld~прошедших~года"
msgstr[2] "%lld~прошедших~лет"
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7144,7 -5634,6 +7137,7 @@@ msgstr[0] "%lld~прошедший~ме
msgstr[1] "%lld~прошедших~месяца"
msgstr[2] "%lld~прошедших~месяцев"
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7152,7 -5641,6 +7145,7 @@@ msgstr[0] "%lld~прошедшую~не
msgstr[1] "%lld~прошедшие~недели"
msgstr[2] "%lld~прошедших~недель"
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7160,7 -5648,6 +7153,7 @@@ msgstr[0] "%lld~прошедший~де
msgstr[1] "%lld~прошедших~дня"
msgstr[2] "%lld~прошедших~дней"
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7168,7 -5655,6 +7161,7 @@@ msgstr[0] "%lld~прошедший~ча
msgstr[1] "%lld~прошедших~часа"
msgstr[2] "%lld~прошедших~часов"
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7176,7 -5662,6 +7169,7 @@@ msgstr[0] "%lld~прошедшую~ми
msgstr[1] "%lld~прошедшие~минуты"
msgstr[2] "%lld~прошедших~минут"
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7184,17 -5669,14 +7177,17 @@@ msgstr[0] "%lld~прошедшую~се
msgstr[1] "%lld~прошедшие~секунды"
msgstr[2] "%lld~прошедших~секунд"
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr "%s: Проверено 0~подписей, зашифровано 0~сообщений."
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, c-format
msgid "%s: Verified 0 signatures."
msgstr "%s: Проверено 0 подписей."
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, c-format
msgid "%s: Verified %ld~signature in the past %s."
msgid_plural "%s: Verified %ld~signatures in the past %s."
@@@ -7202,11 -5684,9 +7195,11 @@@ msgstr[0] "%s: Проверена %ld~�
msgstr[1] "%s: Проверены %ld~прописи за %s."
msgstr[2] "%s: Проверено %ld~подписей за %s."
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
msgid "Encrypted 0 messages."
msgstr "Зашифровано 0 сообщений."
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, c-format
msgid "Encrypted %ld~message in the past %s."
msgid_plural "Encrypted %ld~messages in the past %s."
@@@ -7214,36 -5694,30 +7207,36 @@@ msgstr[0] "Зашифровано %ld~�
msgstr[1] "Зашифрованы %ld~сообщения за %s."
msgstr[2] "Зашифровано %ld~сообщений за %s."
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, c-format
msgid "(policy: %s)"
msgstr "правило: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
"Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
"ключом и этим идентификатором пользователя!\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
"Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
"ключом и этим идентификатором пользователя!\n"
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
"Внимание: мы до сих пор не зашифровали этим ключом ни одного сообщения!\n"
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
"Внимание: мы до сих пор зашифровали этим ключом только одно сообщение!\n"
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7276,20 -5750,16 +7269,20 @@@ msgstr[2] "
"некачественный командой\n"
" %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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "ошибка при открытии базы данных TOFU: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
"ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
"идентификаторов пользователя\n"
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr ""
@@@ -7525,19 -5950,14 +7518,19 @@@ msgstr "
"Синтаксис: kbxutil [параметры] [файлы]\n"
"Просмотр, экспорт, импорт данных щита с ключами\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "Модули RSA пропущены, или их размер не равен %d бит\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "отсутствует открытая экспонента RSA, или ее размер превышает %d бит\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "Функция обработки PIN возвратила ошибку: %s\n"
@@@ -7586,42 -5997,33 +7579,42 @@@ msgstr "
"|P|Введите код разблокировки PIN (PUK) ключа для создания квалифицированных "
"подписей."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "ошибка при получении нового PIN: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "сбой при сохранении отпечатка: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "сбой при сохранении даты создания: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "ошибка получения статуса CHV с карты\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "в ответе отсутствует модуль RSA\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "в ответе отсутствует открытая экспонента RSA\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
msgid "response does not contain the EC public key\n"
msgstr "в ответе отсутствует открытый ключ эллиптической кривой\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "ответ не содержит данных открытого ключа\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "сбой при чтении открытого ключа: %s\n"
@@@ -7629,55 -6031,44 +7622,55 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr "%sНомер : %s%%0AДержатель : %s%%0AСчетчик : %lu%s"
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr "%sНомер : %s%%0AДержатель : %s%s"
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr "Осталось попыток: %d"
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "основной PIN применяется как %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"не удалось применить основной PIN как %s: %s - далее применяться\n"
"как основной не будет\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
msgid "||Please unlock the card"
msgstr "||Разблокируйте карту"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "сбой при проверке CHV%d: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "карта окончательно заблокирована!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7691,23 -6082,18 +7684,23 @@@ msgstr[2] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Введите административный PIN"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "доступ к командам управления не настроен\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Введите PIN"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Введите код сброса для карты"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Код сброса слишком короток; минимальная длина %d\n"
@@@ -7715,77 -6101,59 +7708,77 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Новый код сброса"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Новый административный PIN"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Новый PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "|A|Введите административный PIN и новый административный PIN"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Введите PIN и новый PIN"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "ошибка чтения данных приложения\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "ошибка чтения отпечатка DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "ключ уже существует\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "существующий ключ будет заменен\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "генерация нового ключа\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "запись нового ключа\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "пропущена метка времени создания\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "Простое число RSA %s пропущено или его размер не равен %d бит\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "сбой сохранения ключа: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
msgid "unsupported curve\n"
msgstr "кривая не поддерживается\n"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "сбой при генерации ключа\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
@@@ -7793,31 -6161,25 +7786,31 @@@ msgstr[0] "создание ключа
msgstr[1] "создание ключа завершено (%d секунды)\n"
msgstr[2] "создание ключа завершено (%d секунд)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "недопустимая структура карты OpenPGP (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "отпечаток на карте не совпадает с запрошенным\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "карта не поддерживает хеш-функцию %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "создано подписей: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"проверка административного PIN в данный момент запрещена этой командой\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "нет доступа к %s - непригодная карта OpenPGP?\n"
@@@ -7837,11 -6196,9 +7830,11 @@@ msgstr "|N|Первоначальны�
msgid "run in multi server mode (foreground)"
msgstr "работать в многосерверном режиме (нефоновый режим)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FILE|сохранять журнал в файл FILE"
@@@ -7894,12 -6240,10 +7887,12 @@@ msgid "please use the option '--daemon
msgstr ""
"используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "обработчик fd %d запущен\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "обработчик fd %d остановлен\n"
@@@ -7970,9 -6299,6 +7963,9 @@@ msgstr "число соответств
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "ключ не найден в буфере dirmngr: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "сбой при выделении памяти под указатель на базу данных\n"
@@@ -8148,7 -6434,6 +8141,7 @@@ msgstr "используется схе
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "%u-битный хеш недопустим для %u-битного ключа %s\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(это алгоритм MD2)\n"
@@@ -8190,7 -6468,6 +8183,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "не задана применимость ключа - подразумеваем все\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "ошибка получения информации применимости ключа: %s\n"
@@@ -8446,11 -6670,9 +8439,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr "проблема ресурсов: нехватка выделенной памяти\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(это алгоритм RC2)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(это не похоже на зашифрованное сообщение)\n"
@@@ -8479,127 -6696,96 +8472,127 @@@ msgstr "сертификат '%s' уд�
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "сбой при удалении сертификата \"%s\": %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "не заданы получатели\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "вывести список внешних ключей"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "вывести список цепочек сертификатов"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "импорт сертификатов"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "экспорт сертификатов"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "зарегистрировать криптографическую карту"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "передать команду dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "вызываем gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "вывод в кодировке base64"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "предполагаю, что входные данные в формате PEM"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "предполагаю, что входные данные в формате base64"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "предполагаю, что входные данные в двоичном формате"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "не сверять со списком отозванных сертификатов"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "проверка достоверности с помощью OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|число включаемых сертификатов"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|взять информацию о правилах из файла FILE"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "не проверять правила сертификата"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "запросить недостающих издателей сертификатов"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "не использовать терминал совсем"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|сохранять журнал аудита в файле FILE"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "пакетный режим: ничего не спрашивать"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "принять 'да' как ответ на большинство вопросов"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "принять 'нет' как ответ на большинство вопросов"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|искать ключи на данном сервере ключей"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|использовать алгоритм шифрования NAME"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|использовать хеш-функцию NAME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h для подсказки)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8610,46 -6796,37 +8603,46 @@@ msgstr "
"MIME\n"
"Операция по умолчанию зависит от входных данных\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Замечание: не могу зашифровать для '%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "неизвестная схема проверки '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: не задано имя хоста\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: задан пароль, но не задан пользователь\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: пропускаю эту строку\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "не удалось определить сервер ключей\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "импорт общих сертификатов '%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "невозможно подписать с помощью '%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "недопустимая команда (неявной команды нет)\n"
@@@ -8710,7 -6875,6 +8703,7 @@@ msgstr "проблема повторн
msgid "error storing flags: %s\n"
msgstr "ошибка сохранения признаков: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Ошибка - "
@@@ -8747,7 -6907,6 +8740,7 @@@ msgstr "
"\n"
"%s%sВы уверены, что хотите этого?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8766,50 -6924,40 +8759,50 @@@ msgstr "
"\"%s\"\n"
"Обратите внимание, что этот сертификат НЕ создает квалифицированных подписей!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "хеш-функция %d (%s) для %d не поддерживается; использую %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "хеш-функция для подписи %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "сбой при проверке квалифицированной подписи: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Подпись сделана "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[дата не указана]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " с помощью сертификата с идентификатором 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"недопустимая подпись: атрибут хеш-функции сообщения не соответствует "
"вычисленному\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Хорошая подпись пользователя"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " или"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Это квалифицированная подпись\n"
@@@ -9610,118 -7597,90 +9603,118 @@@ msgstr "нужно абсолютно�
msgid "looking up '%s'\n"
msgstr "поиск '%s'\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "вывести содержание буфера списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|получить список отозванных сертификатов из URL"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "выключить dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "записать буфер на диск"
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "работать, не спрашивая пользователя"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "разрешить посылку запросов OCSP"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr "разрешить проверку версий программ по сети"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "запретить использование HTTP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "запретить использование LDAP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по HTTP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по LDAP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "игнорировать URL служб OCSP из сертификата"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|перенаправлять все запросы HTTP на URL"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|использовать хост HOST для поиска LDAP"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не пользоваться запасными хостами с --ldap-proxy"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|взять список серверов LDAP из файла FILE"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
"добавлять новые серверы, обнаруженные в точках распространения списков "
"отозванных сертификатов, в список серверов"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|установить время ожидания LDAP N секунд"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|использовать ответчик OCSP по URL"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|не возвращать более чем N результатов одного поиска"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
"|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
"по TLS"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr "проводить весь сетевой обмен через Tor"
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9730,11 -7689,9 +9723,11 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. в руководстве \"info\")\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Вызов: @DIRMNGR@ [параметры] (-h для подсказки)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9742,77 -7699,60 +9735,77 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
"Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "допустимые уровни отладки: %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "вызов: %s [параметры] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "двоеточия в имени сокета недопустимы\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: слишком длинная строка - пропущена\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: обнаружен неверный отпечаток\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: ошибка чтения: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: мусор в конце строки игнорируется\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "получен SIGUSR2 - действие не определено\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "получен SIGTERM - завершение работы ...\n"
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "получен SIGTERM - осталось %d активных соединений\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "принудительное выключение\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "получен SIGINT - немедленное завершение работы\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "получен сигнал %d - действие не определено\n"
@@@ -9982,7 -7886,14 +9975,18 @@@ msgstr "'%s' - не URL LDAP\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr "'%s' - недопустимый URL LDAP\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "ошибка чтения '%s': статус HTTP %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "ошибка вывода строки журнала: %s\n"
@@@ -10047,12 -7946,10 +10051,12 @@@ msgstr "добавление '%s:%d' �
msgid "malloc failed: %s\n"
msgstr "сбой malloc: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: недопустимый шаблон '%s'\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search достиг предела сервера по размеру\n"
@@@ -10112,12 -7997,6 +10116,7 @@@ msgstr "ошибка соединени
msgid "error reading HTTP response for '%s': %s\n"
msgstr "ошибка чтения ответа HTTP для '%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "ошибка чтения '%s': статус HTTP %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "ошибка разбора ответа OCSP для '%s': %s\n"
@@@ -10231,76 -8086,60 +10230,76 @@@ msgstr "ответчик OCSP возв�
msgid "OCSP responder returned an too old status\n"
msgstr "ответчик OCSP возвратил слишком старый статус\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "сбой assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "нет сервера LDAP"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "в идентификаторе сертификата нет серийного номера"
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "сбой assuan_inquire: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "сбой fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "ошибка отправки данных: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "сбой start_cert_fetch: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "сбой fetch_next_cert: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "превышено max_replies %d\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "сбой размещения контекста Assuan: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "сбой инициализации сервера: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "сбой регистрации команд с помощью Assuan: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема с приемом Assuan: %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "сбой обработки Assuan: %s\n"
@@@ -10432,186 -8242,139 +10431,186 @@@ msgstr "сбой отправки ст�
msgid "error sending standard options: %s\n"
msgstr "ошибка отправки стандартных параметров: %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Параметры, управляющие выводом диагностики"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Параметры, управляющие настройками"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Параметры, полезные для отладки"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Параметры, управляющие безопасностью"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|сбрасывать ключи SSH по истечении N секунд"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|установить максимальный срок запоминания PIN N секунд"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|установить максимальный срок действия ключа SSH N секунд"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Параметры, обеспечивающие правила для фраз-паролей"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "не позволять обходить правила для фраз-паролей"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|установить минимальную длину фразы-пароля равной N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|n|требовать для новой фразы-пароля не менее N неалфавитных символов"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|проверять новую фразу-пароль по файлу образцов FILE"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|считать фразу-пароль устаревшей через N дней"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "не разрешать повторное использование старых фраз-паролей"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|установить время ожидания ввода пароля N секунд"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|использовать NAME как основной секретный ключ"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|зашифровывать также для идентификатора пользователя NAME"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|установить синонимы электронной почты"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Настройки серверов ключей"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|использовать север ключей по URL"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "разрешить поиск по PKA (запросы DNS)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
"|MECHANISMS|использовать механизмы MECHANISMS для поиска ключей по адресу "
"электронной почты"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "полностью запретить доступ к dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|использовать кодировку NAME для фраз-паролей PKCS#12"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "не проверять списки отозванных сертификатов для корневых сертификатов"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Параметры, управляющие форматом вывода"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Параметры, управляющие интерактивностью и принудительными действиями"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr "Параметры, управляющие применением Tor"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Настройки серверов HTTP"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "использовать системные настройки промежуточного сервера HTTP"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Настройки серверов LDAP"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "Список серверов LDAP"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Настройки OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr "Закрытые ключи"
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr "Криптографические карты"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr "Сеть"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
msgid "Passphrase Entry"
msgstr "Ввод фраз-паролей"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "Компонент не подходит для запуска"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Внешняя проверка компонента %s не прошла"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Обратите внимание, что спецификации групп игнорируются\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, c-format
msgid "error closing '%s'\n"
msgstr "ошибка закрытия '%s'\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, c-format
msgid "error parsing '%s'\n"
msgstr "ошибка при интерпретации '%s'\n"
@@@ -10680,11 -8427,9 +10679,11 @@@ msgstr "вывод в указанны�
msgid "activate changes at runtime, if possible"
msgstr "задействовать изменения во время исполнения, если возможно"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Вызов: @GPGCONF@ [параметры] (-h для подсказки)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10692,15 -8437,12 +10691,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметры]\n"
"Управляет параметрами настроек инструментария @GNUPG@\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Требуется однокомпонентный аргумент"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Компонент не найден"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Аргументы не разрешены"
diff --cc po/sk.po
index 6a2d20b,6aaf628..c25feeb
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -18,7 -17,6 +18,7 @@@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@@ -29,40 -27,31 +29,40 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Skutočne chcete zmazať vybrané kľúče? "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nesprávne heslo
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr ""
@@@ -80,75 -68,59 +80,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Prosím, vložte heslo; toto je tajná veta \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "nesprávne heslo"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "riadok je príliš dlhý\n"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "heslo je príliš dlhé\n"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Neplatný znak ve mene\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "nesprávne MPI"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "nesprávne heslo"
@@@ -158,152 -129,111 +158,152 @@@
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: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, 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:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "zmeniť heslo"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Opakujte heslo: "
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Opakujte heslo: "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "Opakujte heslo: "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "heslo nie je zopakované správne; skúste to znovu"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "heslo nie je zopakované správne; skúste to znovu"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "heslo nie je zopakované správne; skúste to znovu"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@@ -382,8 -299,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "zmeniť heslo"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,124 -308,95 +393,128 @@@ msgstr "
"Možnosti:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Kľúč je nahradený"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "byť o trochu tichší"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "vyhľadať kľúče na serveri kľúčov"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualizovať databázu dôvery"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nepodporované"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -519,181 -405,138 +523,186 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Chyby oznámte, prosím, na adresu <gnupg-bugs at gnu.org>.\n"
"Pripomienky k prekladu <sk-i18n at lists.linux.sk>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "vybraný hashovací algoritmus je neplatný\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nemôžem vytvoriť: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nie je v tomto sedení dostupný\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: nemôžem vytvoriť adresár: %s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, 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:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: preskočené: %s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -544,6 +710,9 @@@ msgstr "
"@Príkazy:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -757,8 -589,6 +766,8 @@@ msgstr "Zrušiť
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
@@@ -817,8 -638,6 +826,8 @@@ msgstr "
msgid "Yes"
msgstr "ano"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -869,19 -681,16 +878,19 @@@ msgstr "zmeniť heslo
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, 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:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
msgid "Delete key"
msgstr "nastaviť kľúč ako platný (enable)"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -901,7 -707,6 +910,7 @@@ msgstr "
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
@@@ -942,8 -737,6 +951,8 @@@ msgstr "chyba pri vytváraní hesla: %s
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
@@@ -1071,7 -838,6 +1080,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
@@@ -1086,7 -850,6 +1095,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1201,8 -941,6 +1210,8 @@@ msgstr "%s: súbor kľúčov (keyring)
msgid "algorithm: %s"
msgstr "ASCII kódovanie: %s\n"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1394,7 -1094,6 +1403,7 @@@ msgstr "neplatný parameter pre import\
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "neplatný parameter pre import\n"
@@@ -1419,7 -1114,6 +1428,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "nespracované"
@@@ -1478,8 -1161,6 +1487,8 @@@ msgstr "verejný kľúč %08lX nebol n�
msgid "waiting for lock %s...\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1612,7 -1267,6 +1621,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVANIE: nájdený neplatný formát zápisu dátumu\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1621,35 -1274,33 +1630,42 @@@
msgid "Enter passphrase: "
msgstr "Vložte heslo: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "VAROVANIE: %s prepíše %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s ešte nepracuje s %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "tajný kľúč nie je dostupný"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemožno previesť v dávkovom móde\n"
@@@ -1659,15 -1309,10 +1675,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "tajné časti kľúča nie sú dostupné\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Váš výber? "
@@@ -1729,154 -1361,107 +1745,139 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "žiadny zodpovedajúci verejný kľúč: %s\n"
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: 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"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
#, fuzzy
msgid "Language preferences: "
msgstr "aktualizovať predvoľby"
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "neplatný znak v reťazci s predvoľbami\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "neplatný znak v reťazci s predvoľbami\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "chyba: neplatný odtlačok\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
#, fuzzy
msgid "CA fingerprint: "
msgstr "vypísať fingerprint"
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "chyba: neplatný odtlačok\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
#, fuzzy
msgid "not an OpenPGP card"
msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Akú veľkosť kľúča si prajete? (1024) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Akú veľkosť kľúča si prajete? (1024) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Akú veľkosť kľúča si prajete? (1024) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrúhlené na %u bitov\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "preskočené: tajný kľúč je už v databáze\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1884,179 -1469,135 +1885,179 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Platnosť podpisu vypršala %s\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Neplatný výber.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Prosím výberte dôvod na revokáciu:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "preskočené: tajný kľúč je už v databáze\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Skutočne podpísať? "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "ukončiť toto menu"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
#, fuzzy
msgid "show admin commands"
msgstr "konfliktné príkazy\n"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "ukázať túto pomoc"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
#, fuzzy
msgid "list all available data"
msgstr "Kľúč k dispozícii na: "
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
#, fuzzy
msgid "change the login name"
msgstr "zmeniť dobu platnosti"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
#, fuzzy
msgid "change the language preferences"
msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
#, fuzzy
msgid "change a CA fingerprint"
msgstr "vypísať fingerprint"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
#, fuzzy
msgid "generate new keys"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
#, fuzzy
msgid "Admin-only command\n"
msgstr "konfliktné príkazy\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "konfliktné príkazy\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatný príkaz (skúste \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento príkaz nefunguje\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba pri čítaní bloku kľúča: %s\n"
@@@ -2118,45 -1647,45 +2119,56 @@@ msgstr "existuje tajný kľúč pre ten
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "aby ste ho zmazali, použite najprv prepínač \"--delete-secret-key\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "v móde S2K nemožno použiť symetrický ESK paket\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "použitá šifra %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' je už skomprimovaný\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROVANIE: súbor `%s' je prázdny\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "čítam z `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2164,40 -1693,34 +2176,41 @@@
msgstr ""
"vyžiadaný kompresný algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zašifrovaný pre: %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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr ""
"použitie %s nie je v móde %s dovolené\n"
"\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s zašifrované dáta\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "zašifrované neznámym algoritmom %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VAROVANIE: správa bola zašifrovaná slabým kľúčom v symetrickej šifre.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problém so zašifrovaným paketom\n"
@@@ -2287,40 -1793,31 +2300,40 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: preskočené: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "zapisujem do '%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
- #: g10/export.c:1903
++#: g10/export.c:1904
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "kľúč %08lX: PGP 2.x kľúč - preskočené\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: nič nebolo vyexportované\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2391,239 -1875,191 +2404,244 @@@ msgid "all values passed to '%s' ignore
msgstr ""
# c-format
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "neplatný parameter pre import\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "vytvoriť podpis oddelený od dokumentu"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[súbor]|vytvoriť podpis v čitateľnom dokumente"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "vytvoriť podpis oddelený od dokumentu"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "šifrovať dáta"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "šifrovanie len so symetrickou šifrou"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "dešifrovať dáta (implicitne)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "verifikovať podpis"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "vypísať zoznam kľúčov"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "vypísať zoznam kľúčov a podpisov"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
#, fuzzy
msgid "list and check key signatures"
msgstr "skontrolovať podpisy kľúčov"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "vypísať zoznam kľúčov a fingerprintov"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "vypísať zoznam tajných kľúčov"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "vytvoriť revokačný certifikát"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "odstrániť kľúč zo súboru verejných kľúčov"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "odstrániť kľúč zo súboru tajných kľúčov"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "podpísať kľúč"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "podpísať kľúč lokálne"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "podpísať kľúč"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "podpísať kľúč lokálne"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "podpísať alebo modifikovať kľúč"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "zmeniť heslo"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exportovať kľúče"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exportovať kľúče na server kľúčov"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importovať kľúče zo servera kľúčov"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "vyhľadať kľúče na serveri kľúčov"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "aktualizovať všetky kľúče zo servera kľúčov"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importovať/zlúčiť kľúče"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "aktualizovať databázu dôvery"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|algo [súbory]|vypíš hash"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "vytvor výstup zakódovaný pomocou ASCII"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|MENO|šifrovať pre MENO"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, 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:564
++#: g10/gpg.c:567
#, 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:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "použiť kánonický textový mód"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "nevykonať žiadne zmeny"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "vyžiadať potvrdenie pred prepísaním"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2632,7 -2068,6 +2650,7 @@@ msgstr "
"(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
"možností)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2662,13 -2097,11 +2680,13 @@@ msgstr "
" --list-keys [mená] vypísať kľúče\n"
" --fingerprint [mená] vypísať fingerprinty\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2683,7 -2116,6 +2701,7 @@@ msgstr "
"podpísať, overiť, šifrovať alebo dešifrovať\n"
"implicitné operácie závisia od vstupných dát\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2691,553 -2123,422 +2709,535 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Verejné kľúče: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Šifry: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Kompresia: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "použitie: gpg [možnosti] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "konfliktné príkazy\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, 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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznáma položka konfigurácie \"%s\"\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, 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:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
#, 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:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
#, 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:2058 g10/gpg.c:2095
- #, fuzzy, c-format
- msgid "valid values for option '%s':\n"
- msgstr "neplatný parameter pre import\n"
-
- #: g10/gpg.c:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "neznámy implicitný adresát `%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Neplatná e-mailová adresa\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný hashovací algoritmus `%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
#, 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:3182
++#: g10/gpg.c:3181
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatný parameter pre export\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parameter pre import\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "neplatný parameter pre export\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parameter pre import\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatný parameter pre export\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemožno nastaviť exec-path na %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prepíše %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolené používať %s s %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedáva s %s zmysel!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: 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:3720
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "položka completes-needed musí byť väčšia ako 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "položka marginals-needed musí byť väčšia ako 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
#, 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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "neplatné defaultné predvoľby\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ešte nepracuje s %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "nemôžete použiť hashovací algoritmus \"%s\" v móde %s\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, fuzzy, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "nemôžete použiť kompresný algoritmus \"%s\" v móde %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dešifrovanie zlyhalo: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4088
++#: g10/gpg.c:4131
#, fuzzy, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr ""
"použitie %s nie je v móde %s dovolené\n"
"\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4148
++#: g10/gpg.c:4192
#, fuzzy, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr ""
"použitie %s nie je v móde %s dovolené\n"
"\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo poslať kľúč na server: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prijať kľúč zo servera: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export kľúča: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa nájsť server: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualizácia servera zlyhala: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus `%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Začnite písať svoju správu ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pre certifikačnú politiku je neplatné\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@@ -3251,7 -2550,6 +3251,7 @@@ msgstr "Zmazať tento kľúč zo súbor
msgid "make timestamp conflicts only a warning"
msgstr "konflikt časového razítka"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|zapísať informácie o stave do tohto FD"
@@@ -3282,334 -2575,271 +3282,339 @@@ msgstr "Pomoc nie je k dispozícii
msgid "No help available for '%s'"
msgstr "Pomoc nie je dostupná pre '%s'"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualizovať databázu dôvery"
- #: g10/import.c:161
++#: g10/import.c:169
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualizovať databázu dôvery"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
msgid "show key during import"
msgstr "vypísať fingerprint"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:170
++#: g10/import.c:178
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "nepoužiteľný tajný kľúč"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ msgid "repair keys on import"
+ msgstr "vypísať fingerprint"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d bol preskočený\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kľúče boli doteraz spracované\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkovo spracovaných kľúčov: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " preskočené nové kľúče: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " preskočené nové kľúče: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identifikátorov: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importované: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmien: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nové id užívateľov: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nové podkľúče: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nové podpisy: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nové revokácie kľúčov: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " prečítané tajné kľúče: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importované tajné kľúče: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajné kľúče nezmenené: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportované: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nové podpisy: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " prečítané tajné kľúče: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1116
++#: g10/import.c:1122
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s podpis, hashovací algoritmus %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "preskočený `%s': %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "kľúč %08lX: HKP poškodenie podkľúča opravené\n"
# c-format
- #: g10/import.c:1500
++#: g10/import.c:1721
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"kľúč %08lX: prijaté id užívateľa '%s', ktorý nie je podpísaný ním samým\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "kľúč %08lX: chýba platný identifikátor užívateľa\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "môže to byť spôsobené chýbajúcim podpisom kľúča ním samým\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kľúč %08lX: verejný kľúč nenájdený: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "kľúč %08lX: nový kľúč - preskočený\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nenájdený zapisovateľný súbor kľúčov (keyring): %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "chyba pri zápise súboru kľúčov (keyring) `%s': %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kľúč %08lX: verejný kľúč \"%s\" importovaný\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kľúč %08lX: nezodpovedá našej kópii\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "kľúč %08lX: nemôžem nájsť originálny blok kľúča: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "kľúč %08lX: nemôžem čítať originálny blok kľúča: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kľúč %08lX: \"%s\" 1 nový identifikátor užívateľa\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kľúč %08lX: \"%s\" 1 nový podpis\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kľúč %08lX: \"%s\" 1 nový podkľúč\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kľúč %08lX: \"%s\" %d nových podkľúčov\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kľúč %08lX: \"%s\" bez zmeny\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "kľúč %08lX: tajný kľúč importovaný\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "preskočené: tajný kľúč je už v databáze\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "kľúč %08lX: tajný kľúč bez verejného kľúča %d - preskočené\n"
@@@ -3624,144 -2854,117 +3629,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"kľúč %08lX: chýba verejný kľúč - nemôžem aplikovať revokačný certifikát\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - zamietnuté\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kľúč %08lX: \"%s\" revokačný certifikát importovaný\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "kľúč %08lX: neexistuje id užívateľa pre podpis\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"kľúč %08lX: nepodporovaný algoritmus verejného kľúča u užívateľského id \"%s"
"\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"kľúč %08lX: neplatný podpis kľúča ním samým u užívateľského id \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie kľúčov\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kľúč %08lX: neplatná väzba podkľúča\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kľúč %08lX: zmazaná viacnásobná väzba podkľúča\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "kľúč %08lX: neexistuje podkľúč na revokáciu kľúča\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kľúč %08lX: neplatný revokačný podkľúč\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kľúč %08lX: zmazaná viacnásobná revokácia podkľúča\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kľúč %08lX: identifikátor užívateľa preskočený '"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "kľúč %08lX: podkľúč preskočený\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "kľúč %08lX: podpis nie je exportovateľný (trieda %02x) - preskočené\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "kľúč %08lX: revokačný certifikát na zlom mieste - preskočené \n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - preskočené\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "kľúč %08lX: neočakávaná podpisová trieda (0x%02X) - preskočené\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kľúč %08lX: zistený duplikovaný identifikátor užívateľa - zlúčený\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROVANIE: kľúč %08lX môže byť revokovaný: skúšam získať revokačný kľúč "
"%08lX\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROVANIE: kľúč %08lX môže byť revokovaný: revokačný kľúč %08lX nenájdený.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kľúč %08lX: pridaný revokačný certifikát \"%s\"\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
@@@ -3803,79 -2999,12 +3808,15 @@@ msgstr "chyba pri čítaní `%s': %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revokácia]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[podpis kľúča ním samým]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s podpis, hashovací algoritmus %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "Dobrý podpis od \""
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- msgid "key %s:\n"
- msgstr "preskočený `%s': %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Užívateľské ID \"%s\" je revokované."
- msgstr[1] "Užívateľské ID \"%s\" je revokované."
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 podpis neoverený, pretože chýba kľúč\n"
- msgstr[1] "1 podpis neoverený, pretože chýba kľúč\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d zlých podpisov\n"
- msgstr[1] "%d zlých podpisov\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Dobrý podpis od \""
- msgstr[1] "Dobrý podpis od \""
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3888,68 -3017,53 +3829,68 @@@ msgstr "
"kontrolou fingerprintov z rôznych zdrojov...)?\n"
"\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Dôverujem čiastočne\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Dôverujem úplne\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Užívateľské ID \"%s\" je revokované."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ste si istý, že stále chcete podpísať tento kľúč? (a/N) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Nemožno podpísať.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Užívateľské ID \"%s\" je revokované."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Skutočne podpísať? "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3958,11 -3072,9 +3899,11 @@@ msgstr "
"Podpis kľúča \"%s\" ním samým je\n"
"podpis vo formáte PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Prajete si ho zmeniť na formát OpenPGP? (a/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3972,11 -3084,9 +3913,11 @@@ msgstr "
"je len lokálny.\n"
"\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3986,43 -3096,34 +3927,43 @@@ msgstr "
"je len lokálny.\n"
"\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Prajete si ho zmeniť na plne exportovateľný podpis? (a/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" je už lokálne podpísaný kľúčom %08lX\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" je už podpísaný kľúčom %08lX\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ste si istý, že stále chcete podpísať tento kľúč? (a/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nič na podpísanie kľúčom %08lX\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Platnosť kľúča vypršala!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnosť kľúča vyprší %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4032,32 -3133,26 +3973,32 @@@ msgstr "
"patrí vyššie uvedenej osobe?\n"
"Pokiaľ nepoznáte odpoveď, zadajte \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpoviem.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Vôbec som to nekontroloval(a).%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Čiastočne som to overil(a).%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Veľmi dôkladne som to overil(a).%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Váš výber? ('?' - viac informácií): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4066,28 -3161,24 +4007,28 @@@ msgstr "
"Ste si istý, že chcete podpísať tento kľúč\n"
"svojím kľúčom: \""
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ide o podpis kľúča ním samým\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"VAROVANIE: podpis nebude označený ako neexportovateľný.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"VAROVANIE: podpis nebude označený ako neodvolateľný (non-revocable).\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
@@@ -4095,237 -3186,187 +4036,237 @@@
"Podpis bude označený ako neexportovateľný.\n"
"\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Podpis bude označený ako neodvolateľný (non-revocable).\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Vôbec som tento kľúč neoveril.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Čiastočne som overil tento kľúč.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Velmi dôkladne som overil tento kľúč.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Skutočne podpísať? "
- #: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
- #: g10/keyedit.c:6673 g10/sign.c:325
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "uložiť a ukončiť"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
#, fuzzy
msgid "show key fingerprint"
msgstr "vypísať fingerprint"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Podpisová notácia: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "vypísať zoznam kľúčov a id užívateľov"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "vyberte identifikátor užívateľa N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
#, fuzzy
msgid "select subkey N"
msgstr "vyberte identifikátor užívateľa N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
#, fuzzy
msgid "check signatures"
msgstr "revokovať podpisy"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "podpísať kľúč lokálne"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "pridať identifikátor užívateľa"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "pridať fotografické ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
#, fuzzy
msgid "delete selected user IDs"
msgstr "zmazať identifikátor užívateľa"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
#, fuzzy
msgid "delete selected subkeys"
msgstr "zmazať sekundárny kľúč"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "pridať revokačný kľúč"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "označiť užívateľské ID ako primárne"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "vypísať zoznam predvolieb (pre expertov)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "vypísať zoznam predvolieb (podrobne)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "zmeniť heslo"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revokovať identifikátor užívateľa"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revokovať sekundárny kľúč"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
#, fuzzy
msgid "enable key"
msgstr "nastaviť kľúč ako platný (enable)"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
#, fuzzy
msgid "disable key"
msgstr "nastaviť kľúč ako neplatný (disable)"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
#, fuzzy
msgid "show selected photo IDs"
msgstr "ukázať fotografické ID"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Tajný kľúč je dostupný.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Na vykonanie tejto operácie je potrebný tajný kľúč.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4333,294 -3374,240 +4274,304 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Kľúč revokovaný."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Skutočne podpísať všetky id užívateľa? "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Skutočne podpísať všetky id užívateľa? "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "neznáma trieda podpisu"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Musíte vybrať aspoň jedno id užívateľa.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Nemôžete zmazať posledné id užívateľa!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Skutočne odstrániť všetky vybrané id užívateľa? "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Skutočne odstrániť toto id užívateľa? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Skutočne odstrániť toto id užívateľa? "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Musíte vybrať aspoň jeden kľúč.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "nemôžem otvoriť `%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Musíte vybrať aspoň jeden kľúč.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Skutočne chcete zmazať vybrané kľúče? "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Skutočne chcete zmazať tento kľúč? "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Skutočne revokovať toto id užívateľa? "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Skutočne chcete revokovať tento kľúč? "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Skutočne chcete revokovať vybrané kľúče? "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Skutočne chcete revokovať tento kľúč? "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
#, fuzzy
msgid "Set preference list to:\n"
msgstr "nastaviť zoznam predvolieb"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Skutočne aktualizovať predvoľby? "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Uložiť zmeny? "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Ukončiť bez uloženia? "
- #: 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "kľúč nebol zmenený, takže nie je potrebné ho aktualizovať.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Nemôžete zmazať posledné id užívateľa!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "chyba: neplatný odtlačok\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "neplatná hodnota\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Takýto identifikátor užívateľa neexistuje.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nič na podpísanie kľúčom %08lX\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "%s nie je platná znaková sada\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "chyba: neplatný odtlačok\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ msgid "subkey \"%s\" not found\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Charakteristiky: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
#, fuzzy
msgid "Notations: "
msgstr "Notácie: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Užívateľské ID vo formáte PGP 2.x nemá žiadne predvoľby\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Tento kľúč môže byť revokovaný kľúčom %s "
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Tento kľúč môže byť revokovaný kľúčom %s "
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
#, fuzzy
msgid "(sensitive)"
msgstr "(citlivá informácia)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s: nemôžem vytvoriť: %s\n"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revokované]"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [platnosť skončí: %s]"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [platnosť skončí: %s]"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, fuzzy, c-format
msgid "usage: %s"
msgstr " dôvera: %c/%c"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, fuzzy, c-format
msgid "trust: %s"
msgstr " dôvera: %c/%c"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Tento kľúč bol označený za neplatný (disabled)"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4628,20 -3615,14 +4579,20 @@@ msgstr "
"Prosím nezabúdajte, že zobrazované údaje o platnosti kľúčov nemusia\n"
"byť správne, pokiaľ znovu nespustíte program.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4649,17 -3630,14 +4600,17 @@@ msgstr "
"VAROVANIE: žiadne ID užívateľa nebolo označené ako primárne. Tento príkaz\n"
"spôsobí, že iné ID užívateľa sa bude považovať primárne.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4668,35 -3646,27 +4619,35 @@@ msgstr "
"VAROVANIE: Toto je PGP2 kľúč. Pridanie fotografického ID môže v niektorých\n"
" verziách PGP viesť k odmietnutiu tohto kľúča.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ste si istý, že ho chcete stále pridať? (a/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Zmazať tento dobrý podpis? (a/N/u)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Zmazať tento neplatný podpis? (a/N/u)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Zmazať tento neznámy podpis? (a/N/u)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Skutočne zmazať tento podpis podpísaný sebou samým? (a/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4704,38 -3674,31 +4655,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Zmazaný %d podpis.\n"
msgstr[1] "Zmazaný %d podpis.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Nič nebolo zmaznané.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
#, fuzzy
msgid "invalid"
msgstr "neplatný spôsob reprezentácie v ASCII"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Užívateľské ID \"%s\" je revokované."
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Užívateľské ID \"%s\" je revokované."
msgstr[1] "Užívateľské ID \"%s\" je revokované."
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "užívateľské ID \"%s\" je už revokované\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "užívateľské ID \"%s\" je už revokované\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4744,217 -3707,176 +4695,222 @@@ msgstr "
"VAROVANIE: Toto je PGP2 kľúč. Pridanie fotografického ID môže v niektorých\n"
" verziách PGP viesť k odmietnutiu tohoto kľúča.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "kľúč vo formáte PGP 2.x nemožno poveriť revokáciou\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "kľúč nemožno poveriť revokáciou ním samým\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VAROVANIE: Tento kľúč bol revokovaný jeho určeným revokátorom/!\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VAROVANIE: označenie kľúča ako revokovací už nemôže byť zrušené!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Ste si istý, že chcete označiť tento kľúč ako revokovací? (a/N): "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "Ste si istý, že chcete označiť tento kľúč ako revokovací? (a/N): "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Mením dobu platnosti sekundárneho kľúča.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Mením dobu platnosti primárneho kľúča.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROVANIE: podpisovací podkľúč %08lX nie je krížovo certifikovaný\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "preskočený v3 podpis kľúča ním samým u užívateľského id \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Ste si istý, že ho chcete použiť? (a/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Ste si istý, že ho chcete použiť? (a/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
#, fuzzy
msgid "Enter the notation: "
msgstr "Podpisová notácia: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Prepísať (a/N)? "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "id užívateľa: \""
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " podpísané %08lX v %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (nexeportovateľné)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnosť podpisu vyprší %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ste si istý, že ho chcete stále revokovať? (a/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvoriť pre tento podpis revokačný certifikát? (a/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
#, fuzzy
msgid "Not signed by you.\n"
msgstr " podpísané %08lX v %s%s\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Podpísali ste nasledujúce identifikátory užívateľa:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
#, fuzzy
msgid " (non-revocable)"
msgstr " (nexeportovateľné)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokované %08lX v %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Chystáte sa revokovať tieto podpisy:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Skutočne vytvoriť revokačné certifikáty? (a/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "neexistuje tajný kľúč\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "užívateľské ID \"%s\" je už revokované\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "VAROVANIE: podpis použivateľkého ID vznikol %d sekund v budúcnosti\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Nemôžete zmazať posledné id užívateľa!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "užívateľské ID \"%s\" je už revokované\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "užívateľské ID \"%s\" je už revokované\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Zobrazujem %s fotografické ID s veľkosťou %ld pre kľúč 0x%08lX (uid %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "neplatný parameter pre import\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "duplicita predvoľby %c%lu\n"
@@@ -5400,8 -4245,6 +5356,8 @@@ msgstr "
"používať disky); vďaka tomu má generátor lepšiu šancu získať dostatok "
"entropie.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
@@@ -5473,7 -4303,6 +5429,7 @@@ msgstr "chyba pri zápise do súboru ve
msgid "public and secret key created and signed.\n"
msgstr "verejný a tajný kľúč boli vytvorené a podpísané.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5482,7 -4311,6 +5438,7 @@@ msgstr "
"Tento kľúč nemôže byť použitý na šifrovanie. Pre vytvorenie\n"
"sekundárneho kľúča na tento účel môžete použiť príkaz \"--edit-key\".\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5490,7 -4318,6 +5446,7 @@@ msgstr "
"kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
"je problém so systémovým časom)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5498,51 -4325,40 +5454,51 @@@ msgstr "
"kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
"je problém so systémovým časom)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZNÁMKA: vytvorenie podkľúča pre kľúče v3 nie je v súlade s OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skutočne vytvoriť? "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritická podpisová politika: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Podpisová politika: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kritická podpisová notácia: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Podpisová notácia: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5550,7 -4366,20 +5506,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d zlých podpisov\n"
msgstr[1] "%d zlých podpisov\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d zlých podpisov\n"
+ msgstr[1] "%d zlých podpisov\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 podpis neoverený, pretože chýba kľúč\n"
+ msgstr[1] "1 podpis neoverený, pretože chýba kľúč\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5558,41 -4387,33 +5530,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 podpis neoverený, pretože vznikla chyba\n"
msgstr[1] "1 podpis neoverený, pretože vznikla chyba\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "súbor kľúčov (keyring)"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Primárny fingerprint kľúča:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Fingerprint podkľúča:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " Primárny fingerprint kľúča:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Fingerprint podkľúča:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kľúča ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr ""
@@@ -5702,270 -4502,221 +5674,276 @@@ msgstr "kľúč `%s' nebol nájdený: %
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "požadujem kľúč %08lX z %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "požadujem kľúč %08lX z %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
msgid "no keyserver known\n"
msgstr "neplatný parameter pre export\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "preskočený `%s': %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"podpísané Vaším kľúčom %08lX v %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "požadujem kľúč %08lX z %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVANIE: nemôžem vymazať dočasný súbor (%s) `%s': %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "zvláštna veľkosť šifrovacieho kľúča pre sedenie (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s kľúč šifrovaného sedenia\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "zašifrované neznámym algoritmom %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "verejný kľúč je %08lX\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "dáta zašifrované verejným kľúčom: správny DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "zašifrované %u-bitovým %s kľúčom, ID %08lX, vytvoreným %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
# [kw]
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "zašifrovaná %s kľúčom, ID %08lX\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dešifrovanie verejným kľúčom zlyhalo: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "zašifrované s %lu heslami\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "zašifrované jedným heslom\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "predpokladám %s šifrovaných dát\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"algoritmus IDEA nie je dostupný; optimisticky sa ho pokúsime nahradiť "
"algoritmom %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROVANIE: správa nemá ochranu integrity\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "dešifrovanie o.k.\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVANIE: so zašifrovanou správou bolo manipulované!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "dešifrovanie zlyhalo: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "POZNÁMKA: odosielateľ požadoval (\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "pôvodné meno súboru='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"samostatný revokačný certifikát - použite \"gpg --import\", ak ho chcete "
"využiť\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
#, fuzzy
msgid "no signature found\n"
msgstr "Dobrý podpis od \""
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ZLÝ podpis od \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypršanou platnosťou od \""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Dobrý podpis od \""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "verifikácia podpisu potlačená\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neviem pracovať s týmito násobnými podpismi\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Platnosť podpisu vypršala %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpis vytvorený %.*s pomocou %s kľúča ID %08lX\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
msgid " issuer \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Kľúč k dispozícii na: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[neistý] "
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "VAROVANIE: Tento kľúč nie certifikovaný dôveryhodným podpisom!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnosť podpisu vypršala %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnosť podpisu vyprší %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s podpis, hashovací algoritmus %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binárne"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "textový mód"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "neznáme"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "neznámy algoritmus verejného kľúča"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemôžem overiť podpis: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "toto nie je podpis oddelený od dokumentu\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "VAROVANIE: Nájdené viacnásobne podpisy. Skontrolovaný bude len prvý.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatný podpis triedy 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starého typu (PGP 2.x)\n"
@@@ -6026,67 -4766,54 +6004,67 @@@ msgstr "chyba pri čítaní: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: použitie parametra \"%s\" sa neodporúča\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "použite namiesto neho \"%s%s\" \n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Nekomprimované"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
#, fuzzy
msgid "uncompressed|none"
msgstr "Nekomprimované"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "čítam možnosti z `%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "neznámy implicitný adresát `%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "neznáma trieda podpisu"
@@@ -6600,35 -5228,32 +6578,40 @@@ msgstr "nemôžem otvoriť podpísané
msgid "can't open signed data fd=%d: %s\n"
msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
+
++#: g10/pubkey-enc.c:128
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonymný adresát; skúšam tajný kľúč %08lX ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "o.k., my sme anonymný adresát.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "staré kódovanie DEK nie je podporováné\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "šifrovací algoritmus %d%s je neznamý alebo je zakázaný\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "POZNÁMKA: v predvoľbách nenájdený šifrovací algoritmus %d\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "POZNÁMKA: platnosť tajného kľúča %08lX skončila %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6789,7 -5386,6 +6772,7 @@@ msgstr "(Žiadny popis)\n
msgid "Is this okay? (y/N) "
msgstr "Je to v poriadku? "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "vytvorený slabý kľúč - skúšam znovu\n"
@@@ -6810,41 -5403,41 +6793,49 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROVANIE: konflikt hashu podpisu v správe\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr ""
+ "použitie %s nie je v móde %s dovolené\n"
+ "\n"
+
++#: g10/sig-check.c:191
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VAROVANIE: podpisovací podkľúč %08lX nie je krížovo certifikovaný\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = prosím o viac informácíi\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"VAROVANIE: podpisovací podkľúč %08lX má neplatnú krížovú certifikáciu\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, 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] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
msgstr[1] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, 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] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
msgstr[1] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6857,7 -5450,6 +6848,7 @@@ msgstr[1] "
"kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
"je problém so systémovým časom)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6869,41 -5461,34 +6860,41 @@@ msgstr[1] "
"kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
"je problém so systémovým časom)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "POZNÁMKA: podpisovému kľúču %08lX skončila platnosť %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "POZNÁMKA: kľúč bol revokovaný"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"predpokladám neplatný podpis kľúčom %08lX, pretože je nastavený neznámy "
"kritický bit\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "kľúč %08lX: neexistuje podkľúč pre revokáciu kľúča\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie podkľúčov\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VAROVANIE: nemožno %%-expandovať notácie (príliš dlhé). Použité "
"neexpandované.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6911,7 -5496,6 +6902,7 @@@ msgstr "
"VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
"neexpandované.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6920,43 -5504,35 +6911,43 @@@ msgstr "
"VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
"neexpandované.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s podpis od: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "podpisujem:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude použité šifrovanie %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "preskočený `%s': duplikovaný\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "preskočené: tajný kľúč je už v databáze\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7047,7 -5607,6 +7038,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "nemôžem zavrieť `%s': %s\n"
@@@ -7159,149 -5696,120 +7150,149 @@@ msgstr "nemôžem pracovať s riadkami
msgid "input line longer than %d characters\n"
msgstr "vstupný riadok je dlhší ako %d znakov\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Podporované algoritmy:\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politika: "
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vypísať zoznam kľúčov"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, 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:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7309,68 -5817,58 +7300,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:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [súbory]|vypíš hash"
@@@ -7378,149 -5876,123 +7369,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "chyba pri zápise súboru kľúčov (keyring) `%s': %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Zmazaných %d podpisov.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "zašifrované s %lu heslami\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Politika: "
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7537,18 -6009,14 +7528,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7785,19 -6208,14 +7776,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
- #: 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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@@ -7846,44 -6255,35 +7837,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr ""
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr ""
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "remove keys from the public keyring"
msgid "response does not contain the EC public key\n"
msgstr "odstrániť kľúč zo súboru verejných kľúčov"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr ""
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
@@@ -7891,54 -6291,43 +7882,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "zmeniť heslo"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "nepodarilo poslať kľúč na server: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr ""
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7948,26 -6337,21 +7939,26 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "zmeniť heslo"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr ""
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "zmeniť heslo"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Prosím výberte dôvod na revokáciu:\n"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
@@@ -7975,117 -6359,93 +7966,117 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr ""
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "zmeniť heslo"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "zmeniť heslo"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
#, fuzzy
msgid "error reading application data\n"
msgstr "chyba pri čítaní bloku kľúča: %s\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' je už skomprimovaný\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr ""
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
#, fuzzy
msgid "generating new key\n"
msgstr "vytvoriť nový pár kľúčov"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "vytvoriť nový pár kľúčov"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr ""
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "toto URI nie je podporované"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr ""
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
#, fuzzy
msgid "generating key failed\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "Vytvorenie kľúča sa nepodarilo: %s\n"
msgstr[1] "Vytvorenie kľúča sa nepodarilo: %s\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s podpis, hashovací algoritmus %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@@ -8106,11 -6463,9 +8097,11 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
@@@ -8166,12 -6510,10 +8157,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8246,9 -6573,6 +8237,9 @@@ msgstr "chyba pri vytváraní hesla: %s
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@@ -8435,7 -6719,6 +8426,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8479,7 -6755,6 +8470,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
@@@ -8743,11 -6965,9 +8734,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8776,143 -6991,112 +8767,143 @@@ msgstr "duplicita predvoľby %c%lu\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Žiadny popis)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "vypísať zoznam tajných kľúčov"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "nesprávny certifikát"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "nesprávny certifikát"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "nesprávny certifikát"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "vytvor výstup zakódovaný pomocou ASCII"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "vôbec nepoužívať terminál"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "dávkový režim: nikdy sa na nič nepýtať"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "automaticky odpovedať áno na väčšinu otázok"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "automaticky odpovedať NIE na väčšinu otázok"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr ""
"pridať tento súbor kľúčov do zoznamu\n"
" používaných súborov kľúčov"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
"|POČÍTAČ|použi tento server kľúčov na vyhľadávanie\n"
" kľúčov"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ALG|použiť šifrovací algoritmus ALG"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|ALG|použiť hashovací algoritmus ALG"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8923,47 -7107,38 +8914,47 @@@ msgstr "
"podpísať, overiť, šifrovať alebo dešifrovať\n"
"implicitné operácie závisia od vstupných dát\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "nemôžem sa pripojiť k `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "neznámy implicitný adresát `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Žiadny popis)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = preskočiť tento kľúč\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "zapisujem do '%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nemôžem zavrieť `%s': %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9026,7 -7189,6 +9017,7 @@@ msgstr "rev? problém overenia revokác
msgid "error storing flags: %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -9055,7 -7213,6 +9046,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9069,51 -7225,41 +9060,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "ochranný algoritmus %d%s nie je podporováný\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "Platnosť podpisu vypršala %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "Dobrý podpis od \""
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " alias \""
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr ""
@@@ -9914,116 -7899,88 +9905,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
msgid "run without asking a user"
msgstr "Ukončiť bez uloženia? "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10037,91 -7994,72 +10028,91 @@@ msgstr "
"(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
"možností)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "použitie: gpg [možnosti] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "Nie je dovolené používať %s s %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riadok je príliš dlhý\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "chyba: neplatný odtlačok\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "chyba pri čítaní: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
msgid "shutdown forced\n"
msgstr "nespracované"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10301,7 -8203,14 +10292,18 @@@ msgstr "\"%s\" nie je súbor JPEG\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "chyba pri zápise súboru kľúčov (keyring) `%s': %s\n"
@@@ -10366,12 -8263,10 +10368,12 @@@ msgstr "vyhľadávam \"%s\" na HKP serv
msgid "malloc failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10435,12 -8318,6 +10437,7 @@@ msgstr "chyba pri zápise súboru kľú
msgid "error reading HTTP response for '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "chyba pri čítaní `%s': %s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
@@@ -10559,77 -8412,61 +10556,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "nemôžem vytvoriť `%s': %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10766,193 -8574,146 +10763,193 @@@ msgstr "podpisovanie zlyhalo: %s\n
msgid "error sending standard options: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|použiť mód hesla N"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|MENO|šifrovať pre MENO"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "chyba siete"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "nesprávne heslo"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "verejný kľúč nenájdený"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "chyba pri čítaní `%s': %s\n"
@@@ -11025,27 -8770,22 +11022,27 @@@ msgstr "použiť ako výstupný súbor
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "verejný kľúč nenájdený"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "zapisujem tajný kľúč do `%s'\n"
diff --cc po/sv.po
index 53567b7,dcd53d1..dc0a295
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -34,7 -33,6 +34,7 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
@@@ -45,47 -43,38 +45,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "_Avbryt"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
msgstr "_OK"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
msgstr "_OK"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "PIN-kod:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
#, fuzzy
#| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
msgstr "_Avbryt"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "Enter new passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -93,7 -82,6 +93,7 @@@ msgstr "Ange ny lösenfras
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Kvalitet:"
@@@ -103,7 -91,6 +103,7 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@@ -112,7 -99,6 +112,7 @@@
"och specialtecken. Fråga din administratör om mer exakt information hur\n"
"man anger säkra lösenfraser."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -120,61 -106,47 +120,61 @@@ msgstr "
"Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
"sessionen"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
"Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Lösenfras:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "stämmer inte överens - försök igen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (försök %d av %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "PIN-koden är för lång"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Lösenfrasen är för lång"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Ogiltiga tecken i PIN-kod"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "PIN-kod för kort"
# MPI står för Multiple Precision Integer (tror jag)
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Felaktig PIN-kod"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Felaktig lösenfras"
@@@ -185,84 -156,57 +185,84 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nycklar större än %d bitar stöds inte\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "identifierade kort med serienummer: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "ingen lämplig kortnyckel hittades: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Ange denna lösenfras igen"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -271,64 -215,50 +271,64 @@@ msgstr "
"Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A %s%%0Ai "
"gpg-agents nyckellager"
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "misslyckades med att skapa flöde från uttag: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Mata in kortet med serienummer"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Ta bort det aktuella kortet och mata in det med serienummer"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Admin PIN-kod"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK-kod"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Nollställ kod"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, fuzzy, c-format
#| msgid "%s%%0A%%0AUse the reader's keypad for input."
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AAnvänd läsarens knappsats för inmatning."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Upprepa denna nollställningskod"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Upprepa denna PUK-kod"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Upprepa denna PIN-kod"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Nollställningskoden repeterades inte korrekt; försök igen"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "PUK-koden repeterades inte korrekt; försök igen"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN-kod repeterades inte korrekt; försök igen"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
@@@ -431,8 -348,6 +431,8 @@@ msgid "Please enter the new passphrase
msgstr "Ange den nya lösenfrasen"
# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -440,147 -355,111 +440,151 @@@ msgstr "
"@Flaggor:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "kör i demonläge (bakgrund)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "kör i serverläge (förgrund)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "kör i serverläge"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "utförlig"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "var något tystare"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "sh-liknande kommandoutdata"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FIL|läs inställningar från FIL"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "frigör inte från konsollen"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "fånga inte tangentbord och mus"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "använd en loggfil för servern"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PRG|använd PRG som SCdaemon-programmet"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "använd inte SCdaemon"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ignorera begäran om att ändra TTY"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ignorera begäran om att ändra X-display"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "använd inte mellanlagring av PIN-kod vid signering"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "tillåt inte återanvändning av gamla lösenfraser"
# Antar att värdet inte ska översättas.
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "tillåt klienter att markera nycklar som \"trusted\""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "tillåt förinställning av lösenfras"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktivera ssh-agent-emulering"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Rapportera fel till <@EMAIL@>.\n"
"Skicka synpunkter på översättningen till <tp-sv at listor.tp-sv.se>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -592,161 -471,127 +596,166 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "vald sammandragsalgoritm är ogiltig\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
msgstr "namnet på uttaget \"%s\" är för långt\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "en gpg-agent är redan igång - startar inte en till\n"
# Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "fel vid hämtning av nonce för uttaget\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "fel när \"%s\" bands till uttag: %s\n"
# Extension är vad? FIXME
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
msgstr "lyssnar på uttaget \"%s\"\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
msgstr "katalogen \"%s\" skapades\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
#| msgid "stat() failed for `%s': %s\n"
msgid "stat() failed for '%s': %s\n"
msgstr "stat() misslyckades för \"%s\": %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
#| msgid "can't use `%s' as home directory\n"
msgid "can't use '%s' as home directory\n"
msgstr "kan inte använda \"%s\" som hemkatalog\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fel vid läsning av nonce på fd %d: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "hanteraren 0x%lx för fd %d startad\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "hanteraren 0x%lx för fd %d avslutad\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, 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:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
# KEYGRIP är ett hexadecimalt värde som representerar hashen för den publika nyckeln
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr ""
"Användning: gpg-preset-passphrase [flaggor] NYCKELHASH (-h för hjälp)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -754,8 -599,6 +763,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
"Underhåll av lösenordscache\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -764,9 -607,6 +773,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:537 g10/gpgv.c:74 kbx/kbxutil.c:81
- #: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -820,8 -652,6 +829,8 @@@ msgstr "avbruten\n
msgid "error while asking for the passphrase: %s\n"
msgstr "fel vid fråga efter lösenfrasen: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -888,8 -709,6 +897,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Nej"
@@@ -945,7 -757,6 +954,7 @@@ msgstr "ändra lösenfras
msgid "I'll change it later"
msgstr "Jag ändrar den senare"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -953,13 -764,11 +962,13 @@@
"%%0A?"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "aktivera nyckel"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -980,7 -786,6 +989,7 @@@ msgstr "%s-nyckeln använder en osäke
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
@@@ -1022,8 -817,6 +1031,8 @@@ msgstr "fel när ett rör skapades: %s\
msgid "error creating a stream for a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "fel vid grening av process: %s\n"
@@@ -1156,7 -923,6 +1165,7 @@@ msgstr "slut på kärna i säkert minn
msgid "out of core while allocating %lu bytes"
msgstr "slut på kärna vid allokering av %lu byte"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
@@@ -1172,7 -936,6 +1181,7 @@@ msgstr "%s:%u: föråldrad flagga \"%s\
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1284,8 -1024,6 +1293,8 @@@ msgstr "Sessionsnyckel skapad
msgid "algorithm: %s"
msgstr "algoritm: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "algoritmen stöds inte: %s"
@@@ -1455,7 -1155,6 +1464,7 @@@ msgstr "ogiltig flagga
msgid "missing argument for option \"%.50s\"\n"
msgstr "argument för flaggan \"%.50s\" saknas\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "invalid argument for option \"%.50s\"\n"
@@@ -1481,7 -1176,6 +1490,7 @@@ msgstr "flagga \"%.50s\" är tvetydig\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommandot \"%.50s\" är tvetydigt\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "slut på minne\n"
@@@ -1544,8 -1227,6 +1553,8 @@@ msgstr "låset \"%s\" gjordes inte: %s\
msgid "waiting for lock %s...\n"
msgstr "väntar på låset %s...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s är för gammal (behöver %s, har %s)\n"
@@@ -1680,7 -1335,6 +1689,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "VARNING: ogiltig notationsdata hittades\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "misslyckades med att förmedla %s-begäran till klient\n"
@@@ -1691,35 -1344,33 +1700,42 @@@
msgid "Enter passphrase: "
msgstr "Ange lösenfrasen\n"
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s fungerar ännu inte med %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kort nr. %s identifierades\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
@@@ -1727,14 -1377,9 +1743,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Återställningskoden är inte tillgänglig längre\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Vad väljer du? "
@@@ -1791,92 -1423,57 +1807,77 @@@ msgstr "Fel: Fullständigt namn för l�
msgid "URL to retrieve public key: "
msgstr "Url för att hämta publik nyckel: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "fel vid läsning av \"%s\": %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "fel vid skrivning till \"%s\": %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Inloggningsdata (kontonamn): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Privat DO-data: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Språkinställningar: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Fel: ogiltig längd på inställningssträngen\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Fel: ogiltigt svar.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "CA-fingeravtryck: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "nyckelåtgärden är inte möjlig: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "inte ett OpenPGP-kort"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Ersätt existerande nyckel? (j/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1892,59 -1489,47 +1893,59 @@@ msgstr "
" kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
" som tillåts.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för signaturnyckeln? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för krypteringsnyckeln? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för autentiseringsnyckeln? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "avrundade uppåt till %u bitar\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
"bitar\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "fel vid ändring av storlek för nyckel %d till %u bitar: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Ersätt existerande nycklar? (j/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1959,172 -1544,128 +1960,172 @@@ msgstr "
" PIN-kod = \"%s\" Admin PIN-kod = \"%s\"\n"
"Du bör ändra dem med kommandot --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Välj vilken typ av nyckel som ska genereras:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Signeringsnyckel\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsnyckel\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnyckel\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Ogiltigt val.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Välj var nyckeln ska sparas:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "läsning misslyckades: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Signera den? (j/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "avsluta denna meny"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "visa administratörskommandon"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "visa denna hjälp"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "lista allt tillgängligt data"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "ändra kortinnehavarens namn"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "ändra url för att hämta nyckel"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "hämta nyckel som anges i kortets url"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "ändra inloggningsnamnet"
# originalet borde ha ett value
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "ändra språkinställningarna"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "ändra kortinnehavarens kön"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "ändra ett CA-fingeravtryck"
# den låter skum
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "växla flagga för att tvinga signatur-PIN-kod"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "generera nya nycklar"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "meny för att ändra eller avblockera PIN-koden"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "validera PIN-koden och lista allt data"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "lås upp PIN-koden med en nollställningskod"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/kort> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Kommandon endast för administratör\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Administrationskommandon tillåts\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Administrationskommandon tillåts inte\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (prova med \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output kan inte användas för detta kommando\n"
# se förra kommentaren
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fel vid läsning av nyckelblock: %s\n"
@@@ -2185,39 -1714,32 +2186,39 @@@ msgstr "det finns en hemlig nyckel fö
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fel när lösenfras skapades: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "använder %s-chiffer\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" är redan komprimerad\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VARNING: \"%s\" är en tom fil\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "läser från \"%s\"\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2225,7 -1747,16 +2226,20 @@@ msgstr "
"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2234,41 -1765,35 +2248,42 @@@ msgstr "
"VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypterad för: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "du kan inte använda %s när du är i %s-läget\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s-krypterad data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krypterad med en okänd algoritm %d\n"
# I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VARNING: meddelandet krypterades med en svag nyckel\n"
"i det symmetriska chiffret.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "problem vid hanteringen av krypterat paket\n"
@@@ -2354,39 -1862,30 +2369,39 @@@ msgstr "ta bort så mycket som möjlig
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: hoppade över: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "skriver till \"%s\"\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "export av hemliga nycklar tillåts inte\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "VARNING: ingenting exporterat\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2458,229 -1944,182 +2473,235 @@@ msgstr "|NAMN|använd NAMN som förval
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "skapa en signatur"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "skapa en klartextsignatur"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "kryptera data"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
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:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "validera en signatur"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "lista nycklar"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "lista nycklar och signaturer"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "lista hemliga nycklar"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den publika nyckelringen"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar från den hemliga nyckelringen"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "ändra en lösenfras"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "exportera nycklar"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "exportera nycklar till en nyckelserver"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "importera nycklar från en nyckelserver"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "sök efter nycklar hos en nyckelserver"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "importera/slå samman nycklar"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "skriv ut kortstatus"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "ändra data på ett kort"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "ändra PIN-kod för ett kort"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "skriv ut kontrollsummor"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "kör i serverläge"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
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:564
++#: g10/gpg.c:567
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:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "gör inga ändringar"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "fråga innan överskrivning"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
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:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2688,7 -2127,6 +2709,7 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2718,14 -2156,12 +2739,14 @@@ msgstr "
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2740,7 -2176,6 +2761,7 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2748,84 -2183,69 +2769,84 @@@ msgstr "
"\n"
"Algoritmer som stöds:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Publik nyckel: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Kontrollsumma: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "användning: gpgsm [flaggor] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2835,21 -2255,18 +2856,21 @@@ msgstr "
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2860,474 -2277,360 +2881,455 @@@ msgstr "
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "okänd konfigurationspost \"%s\"\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "visa foto-id under nyckellistning"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, 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:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er under signaturlistningar"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "visa alla notationer under signaturlistningar"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer under signaturlistningar"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer under signaturlistningar"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, 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:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "visa foto-id under signaturvalidering"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er under signaturvalidering"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "visa alla notationer under signaturvalidering"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer under signaturvalidering"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer under signaturvalidering"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr "visa endast primär användaridentitet i signaturvalidering"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
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:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, 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:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
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:3741
++#: g10/gpg.c:3746
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:3743
++#: g10/gpg.c:3748
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:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
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:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av personligt chiffer\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used 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:3868
++#: g10/gpg.c:3875
#, 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"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr ""
"du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, 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:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr ""
"du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@@ -3342,7 -2643,6 +3344,7 @@@ msgstr "|FIL|ta nycklarna från nyckelr
msgid "make timestamp conflicts only a warning"
msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
@@@ -3372,144 -2667,120 +3374,150 @@@ msgstr "Det finns ingen hjälp tillgän
msgid "No help available for '%s'"
msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "importera signaturer som är markerade som endast lokala"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "reparera skada från pks-nyckelservern under importering"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "uppdatera inte tillitsdatabasen efter importering"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "uppdatera inte tillitsdatabasen efter importering"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "visa nyckelns fingeravtryck"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "acceptera endast uppdateringar till befintliga nycklar"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "ta bort oanvändbara delar från nyckeln efter importering"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "anta att inmatning är i binärformat"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "visa nyckelns fingeravtryck"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "hoppar över block av typen %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu nycklar behandlade än så länge\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antal behandlade enheter: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " utan användaridentiteter: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerade: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " oförändrade: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nya användaridentiteter: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nya undernycklar: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " nya signaturer: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nya nyckelspärrningar: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " antal lästa hemliga nycklar: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerade hemliga nycklar: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " oförändrade hemliga nycklar: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " inte importerade: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signaturer rensade: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " användaridentiteter rensade: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3518,198 -2789,160 +3526,198 @@@ msgstr "
"VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
"algoritmer för dessa användaridentiteter:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": inställning för chifferalgoritmen %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": inställning för sammandragsalgoritmen %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": inställning för komprimeringsalgoritmen %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
"med att algoritmerna inte stämmer\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "nyckel %s: ingen användaridentitet\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
# Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
# vad innebär fnutten i slutet?
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nyckel %s: inga giltiga användaridentiteter\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "detta kan bero på att det saknas en självsignatur\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nyckel %s: ny nyckel - hoppade över\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
# fixme: I appended the %s -wk
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nyckel %s: \"%s\" inte ändrad\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nyckel %s: hemlig nyckel importerades\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "import av hemliga nycklar tillåts inte\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
@@@ -3724,143 -2957,116 +3732,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
# fixme: I appended the %s -wk
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nyckel %s: algoritmen för publika nycklar stöds inte för "
"användaridentiteten \"%s\"\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nyckel %s: ogiltig undernyckelbindning\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nyckel %s: hoppade över undernyckel\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
# nyckeln eller certifikatet??
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
# nyckeln eller klassen?
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nyckel %s: oväntad signaturklass (0x%02X) - hoppade över\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
"nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
@@@ -3906,86 -3105,12 +3914,15 @@@ msgstr "fel vid öppnandet av \"%s\": %
msgid "failed to rebuild keyring cache: %s\n"
msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[spärr]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[självsignatur]"
- #: 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"
- msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "Good signature from"
- msgid " (reordered signatures follow)"
- msgstr "Korrekt signatur från"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
- msgid "key %s:\n"
- msgstr "hoppade över \"%s\": %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
- msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
- msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d felaktiga signaturer\n"
- msgstr[1] "%d felaktiga signaturer\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Korrekt signatur från"
- msgstr[1] "Korrekt signatur från"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3996,17 -3121,14 +3933,17 @@@ msgstr "
"korrekt validera andra användares nycklar (genom att undersöka pass,\n"
"undersöka fingeravtryck från olika källor, etc.)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jag litar marginellt\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jag litar fullständigt\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -4016,51 -3138,39 +3953,51 @@@ msgstr "
"Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
"skapa tillitssignaturer åt dig.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Användaridentiteten \"%s\" är spärrad."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Vill du verkligen fortfarande signera den? (j/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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Kan inte signera.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Användaridentiteten \"%s\" är inte självsignerad."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Användaridentiteten \"%s\" är signerbar. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Signera den? (j/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4069,11 -3179,9 +4006,11 @@@ msgstr "
"Självsignaturen på \"%s\"\n"
"är en signatur av PGP 2.x-typ.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4082,13 -3190,11 +4019,13 @@@ msgstr "
"Giltighetstiden för din nuvarande signatur på \"%s\"\n"
"har gått ut.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
"n) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4097,44 -3203,35 +4034,44 @@@ msgstr "
"Din nuvarande signatur på \"%s\"\n"
"är en lokal signatur.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" var redan signerad av nyckeln %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Vill du verkligen signera den igen ändå?(j/N)"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Det finns inget att signera med nyckeln %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Giltighetstiden för denna nyckel har gått ut!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4143,33 -3240,27 +4080,33 @@@ msgstr "
"Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
"personen som nämns ovan? Om du inte vet vad du ska svara, svara \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jag vill inte svara.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jag har inte kontrollerat alls.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jag har gjort viss kontroll.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Jag har gjort en noggrann kontroll.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Ditt val? (skriv \"?\" för mer information): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4178,230 -3269,176 +4115,230 @@@ msgstr "
"Är du verkligen säker på att du vill signera denna nyckel\n"
"med din nyckel \"%s\" (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Detta kommer att bli en självsignatur.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Verkligen signera? (j/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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
"att ändra.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "fel när lösenfras skapades: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "spara och avsluta"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "visa nyckelns fingeravtryck"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Ange nyckelhashen: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "lista nycklar och användaridentiteter"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "välj användaridentiteten N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "välj undernyckel N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "kontrollera signaturer"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"signera valda användaridentiteter [* se nedan för relaterade kommandon]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "signera valda användaridentiteter lokalt"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "signera valda användaridentiteter med en tillitssignatur"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "lägg till en användaridentitet"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "lägg till ett foto-id"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "ta bort valda användaridentiteter"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "lägg till en undernyckel"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "lägg till en nyckel till ett smartkort"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "flytta en nyckel till ett smartkort"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "flytta en nyckelkopia till ett smartkort"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "ta bort valda undernycklar"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "lägg till en spärrnyckel"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "ta bort signaturer från valda användaridentiteter"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "flagga vald användaridentitet som primär"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "lista inställningar (expertläge)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "lista inställningar (utförligt)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "ställ in inställningslista för valda användaridentiteter"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"ställ in url till föredragen nyckelserver för valda användaridentiteter"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "ställ in en notation för valda användaridentiteter"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "ändra lösenfrasen"
# originalet borde ha ett value
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "ändra ägartillitsvärdet"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "spärra signaturer på valda användaridentiteter"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "spärra valda användaridentiteter"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "spärra nyckel eller valda undernycklar"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "aktivera nyckel"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "inaktivera nyckel"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "visa valda foto-id:n"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
"signaturer från nyckeln"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
"nyckeln"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Den hemliga nyckeln finns tillgänglig.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4421,291 -3458,239 +4358,303 @@@ msgstr "
"signaturer\n"
" (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Nyckeln är spärrad."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Verkligen signera alla användaridentiteter? (j/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "Verkligen signera alla användaridentiteter? (j/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Okänd signaturtyp \"%s\"\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Du måste välja åtminstone en användaridentitet.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Verkligen flytta den primära nyckeln? (j/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Du måste välja exakt en nyckel.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Kommandot förväntar ett filnamnsargument\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Kan inte öppna \"%s\": %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Du måste välja åtminstone en nyckel.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Verkligen spärra denna användaridentitet? (j/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
"tillhandahåller\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Ställ in inställningslista till:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
"(j/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Spara ändringar? (j/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Avsluta utan att spara? (j/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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "kontroll mot tillitslistan misslyckades: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "kontroll mot tillitslistan misslyckades: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ogiltigt fingeravtryck"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "misslyckades med att få fingeravtrycket\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "ogiltigt värde\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Det finns inget att signera med nyckeln %s\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "invalid fingerprint"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "ogiltigt fingeravtryck"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "nyckeln \"%s\" hittades inte: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Sammandrag: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Nyckelserver no-modify"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Föredragen nyckelserver: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
"typ.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Följande nyckel blev spärrad den %s av %s nyckel %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(känsligt)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "skapat: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "spärrad: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "utgånget: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "går ut: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "kortnummer: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "giltighet: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Denna nyckel har stängts av"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4713,18 -3698,12 +4662,18 @@@ 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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "utgånget"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4733,17 -3712,14 +4682,17 @@@ msgstr "
"Detta kommando kan göra att en annan användaridentitet antas\n"
"vara den primära identiteten.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4752,36 -3728,28 +4701,36 @@@ msgstr "
"VARNING: Detta är en nyckel av PGP2-typ. Om du lägger till ett foto-id kan\n"
" vissa versioner av PGP avvisa denna nyckel.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vill du radera denna okända signatur? (j/N/a)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Verkligen ta bort denna självsignatur? (j/N)"
# skulle lika gärna kunna heta 1 signatur va?
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4789,20 -3757,16 +4738,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Raderade %d signatur.\n"
msgstr[1] "Raderade %d signatur.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Ingenting raderat.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "ogiltigt"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4810,17 -3774,14 +4759,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Användaridentitet \"%s\": redan minimerad\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Användaridentitet \"%s\": redan rensad\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4830,39 -3791,31 +4779,39 @@@ msgstr "
"denna\n"
" nyckel inte användas i vissa versioner av PGP.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Ange användaridentiteten för spärrnyckeln: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
# designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
# designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4872,178 -3825,146 +4821,184 @@@ msgid "
msgstr ""
"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändrar utgångstid för en undernyckel.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
# Vad betyder det?
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Välj endast en användaridentitet.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Ange din föredragna nyckelserver-url: "
# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Är du säker på att du vill ersätta det? (j/N) "
# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Är du säker på att du vill ta bort det? (j/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Ange notationen: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Fortsätt? (j/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen användaridentitet med indexet %d\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen användaridentitet med hashen %s\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "Ingen undernyckel med indexet %d\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernyckel med indexet %d\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "användaridentitet: \"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "signerat av din nyckel %s den %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (icke exporterbar)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denna signatur gick ut den %s.\n"
# nyckel? signatur?
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Inte signerad av dig.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (inte spärrbar)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "spärrad av din nyckel %s den %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Du är på väg att spärra dessa signaturer:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "användaridentiteten \"%s\" är redan spärrad\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
"framtiden\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
++#: g10/keygen.c: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/keygen.c:317
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
@@@ -5498,8 -4342,6 +5453,8 @@@ msgstr "
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
+#: g10/keygen.c: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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
@@@ -5577,7 -4406,6 +5532,7 @@@ msgid "public and secret key created an
msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
# Flagga.. inte kommando
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5587,7 -4415,6 +5542,7 @@@ msgstr "
"syfte.\n"
# c-format behövs inte i singularis
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5595,7 -4422,6 +5550,7 @@@ msgstr "
"nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5603,49 -4429,38 +5558,49 @@@ msgstr "
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "aldrig"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Viktig signaturpolicy: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Signaturpolicy: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Föredragen kritisk nyckelserver: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kritisk signaturnotation: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Signaturnotation: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5653,7 -4468,20 +5608,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d felaktiga signaturer\n"
msgstr[1] "%d felaktiga signaturer\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d felaktiga signaturer\n"
+ msgstr[1] "%d felaktiga signaturer\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
+ msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5661,40 -4489,32 +5632,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signatur validerades inte eftersom ett fel uppstod\n"
msgstr[1] "1 signatur validerades inte eftersom ett fel uppstod\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Nyckelring"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr "Nyckelns fingeravtryck ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Kortets serienr ="
@@@ -5804,104 -4603,84 +5775,104 @@@ msgstr "nyckeln hittades inte på nycke
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "begär nyckeln %s från %s-servern %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "begär nyckeln %s från %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "ingen nyckelserveråtgärd!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "skickar nyckeln %s till %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "begär nyckeln %s från %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s krypterad sessionsnyckel\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "publik nyckel är %s\n"
# Men jag ändrade så det blev närmare originalet. Per
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "krypterad med %s-nyckel, id %s\n"
# Motsatsen till kryptering med symmetrisk nyckel.
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dekryptering med publik nyckel misslyckades: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "krypterad med %lu lösenfraser\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "krypterad med with 1 lösenfras\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "antar att %s krypterade data\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
@@@ -5909,169 -4688,140 +5880,175 @@@
"istället\n"
# Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "dekrypteringen lyckades\n"
# Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekrypteringen misslyckades: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "ursprungligt filnamn=\"%.*s\"\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VARNING: multipla klartexter har påträffats\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"fristående spärrcertifikat - använd \"gpg --import\" för\n"
"att verkställa\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "ingen signatur hittades\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FELAKTIG signatur från \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utgången signatur från \"%s\""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekt signatur från \"%s\""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "signaturvalidering utlämnad\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "kan inte hantera detta tvetydliga signaturdata\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur gjord %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " med %s-nyckeln %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " även känd som \"%s\""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Nyckeln tillgänglig hos: "
# Visas vid ogiltig signatur:
# Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[osäkert]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " även känd som \"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Giltighetstiden för signaturen har upphört %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Giltighetstiden för signaturen går ut %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s signatur, sammandragsalgoritm %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "binär"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "textläge"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "okänd"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritm: %s"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan inte kontrollera signaturen: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "detta är inte någon signatur i en separat fil\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
"kontrolleras.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "fristående signatur av klassen 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "signatur av den gamla (PGP 2.x) typen\n"
@@@ -6132,72 -4871,59 +6109,72 @@@ msgstr "läsfel i \"%s\": %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Använd \"%s%s\" istället\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Okomprimerad"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "okomprimerad|ingen"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, 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:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydlig flagga \"%s\"\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
#, 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:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6726,37 -5353,35 +6703,43 @@@ msgstr "kan inte öppna signerat data \
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan inte öppna signerad data fd=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "certifikatet är inte användbart för kryptering\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonym mottagare; provar med den hemliga nyckeln %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, vi är den anonyma mottagaren.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "chifferalgoritmen %d%s är okänd eller inaktiverad\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6923,7 -5520,6 +6906,7 @@@ msgstr "(Ingen beskrivning angiven)\n
msgid "Is this okay? (y/N) "
msgstr "Är detta OK? (j/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "skapade en svag nyckel - försöker igen\n"
@@@ -6946,29 -5539,29 +6929,35 @@@ msgstr "%s-nyckeln använder en osäke
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "du kan inte använda %s när du är i %s-läget\n"
+
# Vad betyder det?
- #: g10/sig-check.c:171
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "se %s för mer information\n"
# cross-certification?
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "VARNING signeringsundernyckel %s har en ogiltig korscertifiering\n"
# behövs verkligen c-format här?
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6977,7 -5570,6 +6966,7 @@@ msgstr[0] "den publika nyckeln %s är %
msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
# behövs verkligen c-format här?
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6986,7 -5578,6 +6975,7 @@@ msgstr[0] "den publika nyckeln %s är %
msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
# c-format behövs inte i singularis
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7002,7 -5593,6 +6991,7 @@@ msgstr[1] "
"klocka)\n"
# c-format behövs inte i singularis
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7016,42 -5606,35 +7005,42 @@@ msgstr[1] "
"nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
"klocka)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VARNING: kan inte %%-expandera anteckning (för stor). Använder den utan "
"expansion.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -7059,7 -5642,6 +7048,7 @@@ msgstr "
"VARNING: kunde inte %%-expandera policy-url (för stor). Använder "
"oexpanderad.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -7068,12 -5650,10 +7057,12 @@@ msgstr "
"VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
"stor). Använder oexpanderad.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signatur från: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7081,32 -5661,26 +7070,32 @@@ msgstr "
"VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "signerar:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "krypteringen %s kommer att användas\n"
# Slumptalsgenerator: Random Number Generator
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppade över \"%s\": förekommer flera gånger\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
@@@ -7196,7 -5754,6 +7185,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7308,149 -5843,121 +7297,149 @@@ msgstr "kan inte hantera text med rade
msgid "input line longer than %d characters\n"
msgstr "indataraden är längre än %d tecken\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algoritmen stöds inte: %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "fel när temporärfil skapades: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: fel vid läsning av katalogpost: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "fel vid öppnandet av \"%s\": %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "lista nycklar och användaridentiteter"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "giltighet: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, 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:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista nycklar"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7458,7 -5965,6 +7447,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7466,7 -5972,6 +7455,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:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7474,7 -5979,6 +7463,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7482,54 -5986,46 +7471,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7538,108 -6034,90 +7527,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, 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:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, 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:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Raderade %d signaturer.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7647,13 -6125,11 +7636,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "krypterad med %lu lösenfraser\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7661,31 -6137,25 +7650,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "giltighet: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7702,19 -6172,15 +7691,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, 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:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7977,19 -6398,14 +7966,19 @@@ msgstr "
"Syntax: kbxutil [flaggor] [filer]\n"
"lista, exportera, importera nyckelskåpsdata\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-återanrop returnerade fel: %s\n"
@@@ -8039,44 -6446,35 +8028,44 @@@ msgstr "
"|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
"signaturer med."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "misslyckades med att lagra datum för skapandet: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "fel vid hämtning av CHV-status från kort\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "svaret innehåller inte en RSA-modulus\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "svaret innehåller inte den publika RSA-exponenten\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public key\n"
msgstr "svaret innehåller inte den publika RSA-exponenten\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "svaret innehåller inte publikt nyckeldata\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "läsning av publik nyckel misslyckades: %s\n"
@@@ -8084,57 -6482,46 +8073,57 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "använder standard-PIN som %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"misslyckades med att använda standard-PIN som %s: %s - inaktiverar "
"ytterligare standardanvändning\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Ange PIN-koden"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "validering av CHV%d misslyckades: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "kortet är låst permanent!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -8147,23 -6534,18 +8136,23 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Ange administratörens PIN-kod"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Ange PIN-koden"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Ange nollställningskoden för kortet"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Nollställningskoden är för kort; minimumlängd är %d\n"
@@@ -8171,83 -6553,65 +8160,83 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Ny nollställningskod"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN-kod"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Ny PIN-kod"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
#| msgid "|A|Please enter the Admin PIN"
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "|A|Ange administratörens PIN-kod"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please enter the PIN and New PIN"
msgstr "||Ange PIN-koden"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "fel vid läsning av programdata\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "fel vid läsning av fingeravtryckets DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "nyckeln finns redan\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "befintlig nyckel kommer att ersättas\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "genererar ny nyckel\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "skriver ny nyckel\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "tidsstämpel för skapandet saknas\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "misslyckades med att lagra nyckeln: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported algorithm: %s"
msgid "unsupported curve\n"
msgstr "algoritmen stöds inte: %s"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "var god vänta under tiden nyckeln genereras ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "nyckelgenereringen misslyckades\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -8255,32 -6619,26 +8244,32 @@@ msgid_plural "key generation completed
msgstr[0] "nyckelgenereringen är färdig (%d sekunder)\n"
msgstr[1] "nyckelgenereringen är färdig (%d sekunder)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "avtrycket på kortet stämmer inte med den begärda\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer skapade hittills: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"validering av Admin PIN-kod är för närvarande förbjudet genom detta "
"kommando\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@@ -8302,11 -6657,9 +8291,11 @@@ msgstr "|N|Initial PIN-kod
msgid "run in multi server mode (foreground)"
msgstr "kör i multiserverläge (förgrund)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FIL|skriv en logg till FIL"
@@@ -8369,12 -6711,10 +8358,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "hanterare för fd %d startad\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "hanterare för fd %d avslutad\n"
@@@ -8450,9 -6775,6 +8439,9 @@@ msgstr "antal matchande certifikat: %d\
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "misslyckades med att allokera keyDB-hanterare\n"
@@@ -8625,7 -6907,6 +8614,7 @@@ msgstr "valideringsmodell använd: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(det här är MD2-algoritmen)\n"
@@@ -8668,7 -6942,6 +8657,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
@@@ -8957,11 -7177,9 +8946,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr "resursproblem: slut på minne\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(det här är RC2-algoritmen)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
@@@ -8993,130 -7206,99 +8982,130 @@@ msgstr "certifikatet \"%s\" togs bort\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "inga giltiga mottagare angavs\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "lista externa nycklar"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "lista certifikatkedja"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "importera certifikat"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "exportera certifikat"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "registrera ett smartkort"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "skicka ett kommando till dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "starta gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "skapa base-64-kodat utdata"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "anta att inmatning är i PEM-format"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "anta att inmatning är i base-64-format"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "anta att inmatning är i binärformat"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "kontrollera aldrig mot spärrlista"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "kontrollera giltigheten med OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|antal certifikat att inkludera"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FIL|hämta policyinformation från FIL"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "kontrollera inte certifikatpolicier"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "hämta saknade utfärdarcertifikat"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "använd inte terminalen alls"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FIL|skriv en serverlägeslogg till FIL"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FIL|skriv en granskningslogg till FIL"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "satsläge: fråga aldrig"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "anta ja på de flesta frågorna"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "anta nej på de flesta frågorna"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMN|använd chifferalgoritmen NAMN"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -9131,50 -7313,41 +9120,50 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
"standardåtgärden beror på inmatningsdata\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "okänd valideringsmodell \"%s\"\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: inget värdnamn angivet\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: lösenord angivet utan användare\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: hoppar över denna rad\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "kunde inte tolka nyckelserver\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importerar vanliga certifikat \"%s\"\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "kan inte signera med \"%s\": %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@@ -9235,7 -7396,6 +9224,7 @@@ msgstr "problem vid ytterligare söknin
msgid "error storing flags: %s\n"
msgstr "fel vid lagring av flaggor: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Fel - "
@@@ -9273,7 -7429,6 +9262,7 @@@ msgstr "
"\n"
"%s%sÄr du säker på att du vill göra det här?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9293,49 -7447,39 +9282,49 @@@ msgstr "
"Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
"signatur!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "hashalgoritm %d (%s) för signerare %d stöds inte; använder %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "hashalgoritm som används för signerare %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Signatur gjord "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[datum inte angivet]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " använder certifikat-id 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"ogiltig signatur: attribut för kontrollsumma matchar inte den beräknade\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Korrekt signatur från"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " även känd som"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Det här är en kvalificerad signatur\n"
@@@ -10216,128 -8199,100 +10205,128 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "|FILE|run commands from FILE on startup"
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FIL|kör kommandon från FIL vid uppstart"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "skicka ett kommando till dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv serverlägesloggar till FIL"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Avsluta utan att spara? (j/N) "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FIL|läs inställningar från FIL"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL| använd nyckelservern på URL"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
# inställningar istället för flaggor?
# Nej, här är det bruksanvisningen för kommandoraden.
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10350,13 -8305,11 +10339,13 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10368,88 -8321,71 +10357,88 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "användning: gpgsm [flaggor] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
#| msgid "line too long - skipped\n"
msgid "%s:%u: line too long - skipped\n"
msgstr "raden är för lång - hoppades över\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ogiltigt fingeravtryck"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "läsfel i \"%s\": %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "inte tvingad"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10641,7 -8541,16 +10630,20 @@@ msgstr "\"%s\" är inte en JPEG-fil\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ #| msgid "error running `%s': exit status %d\n"
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
+
++#: dirmngr/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"
+ msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
#| msgid "error writing to %s: %s\n"
msgid "error printing log line: %s\n"
@@@ -10713,12 -8610,10 +10715,12 @@@ msgstr "skickar nyckeln %s till %s-serv
msgid "malloc failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10790,13 -8673,6 +10792,7 @@@ msgstr "fel vid skrivning till \"%s\":
msgid "error reading HTTP response for '%s': %s\n"
msgstr "fel vid läsning från %s: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- #| msgid "error running `%s': exit status %d\n"
- msgid "error accessing '%s': http status %u\n"
- msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
@@@ -10929,86 -8781,70 +10925,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "sändande rad misslyckades: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "sändande rad misslyckades: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
#| msgid "cannot allocate outfile string: %s\n"
msgid "can't allocate control structure: %s\n"
msgstr "kan inte allokera utfilssträng: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
#| msgid "failed to create stream from socket: %s\n"
msgid "failed to allocate assuan context: %s\n"
msgstr "misslyckades med att skapa flöde från uttag: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "misslyckades med att lagra datum för skapandet: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -11163,193 -8970,146 +11159,193 @@@ msgstr "sändande rad misslyckades: %s\
msgid "error sending standard options: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Flaggor som kontrollerar diagnosutdata"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Flaggor som kontrollerar konfigurationen"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Flaggor användbara för felsökning"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Flaggor som kontrollerar säkerheten"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "tillåt inte att gå förbi lösenfraspolicyn"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|ställ in minimal nödvändig längd för nya lösenfraser till N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|kräv minst N icke-alfabetiska tecken för en ny lösenfras"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "tillåt inte återanvändning av gamla lösenfraser"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|ange e-postalias (ett eller flera)"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Konfiguration för nyckelservrar"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL| använd nyckelservern på URL"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MEKANISMER|använd MEKANISMER för att hitta nycklar efter e-postadress"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "inaktivera all åtkomst till dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "kontrollera inte spärrlistor för rotcertifikat"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Flaggor som kontrollerar formatet på utdata"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Flaggor som kontrollerar säkerheten"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Konfiguration för HTTP-servrar"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "använd systemets HTTP-proxyinställningar"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration av LDAP-servrar som ska användas"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "LDAP-serverlista"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Konfiguration för OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Felaktig lösenfras"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Komponenten hittades inte"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Extern validering av komponenten %s misslyckades"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Observera att gruppspecifikationer ignoreras\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing '%s'\n"
msgstr "fel vid stängning av %s: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -11431,13 -9175,11 +11427,13 @@@ msgstr "använd som fil för utdata
msgid "activate changes at runtime, if possible"
msgstr "aktivera ändringar vid körtid, om möjligt"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11449,15 -9191,12 +11445,15 @@@ msgstr "
"Syntax: gpgconf [flaggor]\n"
"Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Behöver ett komponentargument"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Komponenten hittades inte"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Inget argument tillåts"
diff --cc po/tr.po
index d8dd62f,0fa3c40..b333f31
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -18,7 -17,6 +18,7 @@@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "PIN giriş kilidi edinilemedi: %s\n"
@@@ -29,41 -27,32 +29,41 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "Enter new passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -71,7 -60,6 +71,7 @@@ msgstr "Yeni anahtar parolasını girin
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Kalite:"
@@@ -81,11 -69,9 +81,11 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -93,7 -79,6 +93,7 @@@ msgstr "
"Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
"olabilecek"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -101,53 -86,40 +101,53 @@@ msgstr "
"Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
"kilitsiz olabilecek"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Anahtar Parolası:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "aynı değiller - tekrar deneyin"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (%d/%d dene)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "PIN çok uzun"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Anahtar Parolası çok uzun"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "PIN içinde geçersiz karakterler var"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "PIN çok kısa"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "PIN hatalı"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Anahtar Parolası hatalı"
@@@ -156,84 -127,57 +156,84 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
- #: agent/command-ssh.c: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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "Algılanan kartın seri nr: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, 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:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "uygun bir kart anahtarı yok: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Lütfen bu anahtar parolasını tekrar girin"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -242,65 -186,51 +242,65 @@@ 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:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "sokette akım oluşturulamadı: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Yönetici PIN'i"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Sıfırlama Kodu"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Bu Sıfırlama Kodu tekrarlansın"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "Bu PIN tekrarlansın "
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Bu PIN tekrarlansın "
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Sıfırlama Kodu doğru tekrarlanmadı; tekrar deneyin"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
@@@ -401,8 -318,6 +401,8 @@@ msgstr "Yeni anahtarınızı korumak i�
msgid "Please enter the new passphrase"
msgstr "Lütfen yeni anahtar parolasını girin"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -410,145 -325,109 +410,149 @@@ msgstr "
"@Seçenekler:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "artalan süreci olarak çalışır"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "sunucu olarak (önalanda) çalışır"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "sunucu kipinde çalışır"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 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ı"
- #: 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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "sh tarzı komut çıktısı"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "konsoldan kopulmaz"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "klavye ve fare gaspedilmez"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "sunucu için bir günlük dosyası kullanılır"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "Akıllı kart süreci kullanılmaz"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "TTY değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "X birimi değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "imzalarken PIN arabelleği kullanılmaz"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "anahtar parolasının önceden atanmasına izin verilir"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "ssh-agent öykünümü etkinleşir"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 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 <"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -560,158 -439,124 +564,163 @@@ 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:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, 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:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "seçilen özet algoritması geçersiz\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
msgstr "soketin ismi `%s' çok uzun\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "çalışan bir gpg-agent zaten var - bir yenisi başlatılmayacak\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "soket için tuz alınırken hata\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "soket dinleme başarısız: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
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
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
msgstr "dizin `%s' oluşturuldu\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
#| msgid "stat() failed for `%s': %s\n"
msgid "stat() failed for '%s': %s\n"
msgstr "%s için stat() başarısız oldu: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
#| msgid "can't use `%s' as home directory\n"
msgid "can't use '%s' as home directory\n"
msgstr "`%s' ev dizini olarak kullanılamıyor\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, 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:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr ""
"Kullanımı: gpg-preset-passphrase [seçenekler] ANHMAŞASI (yardım için -h)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -719,8 -564,6 +728,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:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -728,9 -571,6 +737,9 @@@ msgstr "
"@Komutlar:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -786,8 -618,6 +795,8 @@@ msgstr "iptal edildi\n
msgid "error while asking for the passphrase: %s\n"
msgstr "anahtar parolası sorulurken hata: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -854,8 -675,6 +863,8 @@@ msgstr "
msgid "Yes"
msgstr "Evet"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Hayır"
@@@ -910,7 -722,6 +919,7 @@@ msgstr "Anahtar parolasını değiştir
msgid "I'll change it later"
msgstr "Sonra değiştireceğim"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -918,13 -729,11 +927,13 @@@
"%%0A?"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "anahtarı kullanıma sokar"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -945,7 -751,6 +954,7 @@@ msgstr "%s anahtarı, güvensiz bir çi
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
@@@ -987,8 -782,6 +996,8 @@@ msgstr "boru oluşturulurken hata: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "süreç çatallanırken hata: %s\n"
@@@ -1120,7 -887,6 +1129,7 @@@ msgstr "%lu bayt ayrılırken güvenli
msgid "out of core while allocating %lu bytes"
msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "yeterli bellek ayrılırken hata: %s\n"
@@@ -1136,7 -900,6 +1145,7 @@@ msgstr "%s:%u: eskimiş seçenek \"%s\
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1252,8 -992,6 +1261,8 @@@ msgstr "Oturum anahtarı oluşturuldu
msgid "algorithm: %s"
msgstr "algoritma: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "desteklenmeyen algoritma: %s"
@@@ -1424,7 -1124,6 +1433,7 @@@ msgstr "geçersiz seçenek
msgid "missing argument for option \"%.50s\"\n"
msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "invalid argument for option \"%.50s\"\n"
@@@ -1450,7 -1145,6 +1459,7 @@@ msgstr "\"%.50s\" seçeneği belirsiz\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" komutu belirsiz\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "nüve dışında\n"
@@@ -1513,8 -1196,6 +1522,8 @@@ msgstr "kilit `%s' yapılmadı: %s\n
msgid "waiting for lock %s...\n"
msgstr "%s kilidi için bekleniyor...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@@ -1644,7 -1299,6 +1653,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1655,35 -1308,33 +1664,42 @@@
msgid "Enter passphrase: "
msgstr "Anahtar parolasını giriniz\n"
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s, %s ile henüz çalışmıyor\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
@@@ -1691,14 -1341,9 +1707,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
- #: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
- #: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
++#: g10/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Seçiminiz? "
@@@ -1755,147 -1387,100 +1771,132 @@@ msgstr "Hata: İsimler birlikte çok uz
msgid "URL to retrieve public key: "
msgstr "genel anahtarın alınacağı URL: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
-
- #: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
- #: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "\"%s\" okunurken hata: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "`%s' yazılırken hata: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Oturum açma verisi (hesap adı): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Özel DO verisi: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Dil tercihleri: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Hata: yanıt geçersiz.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "CA parmak izi: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Hata: biçimli parmakizi geçersiz\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "anahtar işlemi mümkün değil: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "bir OpenPGP kartı değil"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u bite yuvarlandı\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1910,168 -1495,124 +1911,168 @@@ msgstr "
" PIN = `%s' Admin PIN = `%s'\n"
"Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) İmzalama anahtarı\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Şifreleme anahtarı\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Kimlik kanıtlama anahtarı\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Seçim geçersiz.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "read başarısız: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "İmzalayacak mısınız? (e/H veya y/N) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "bu menüden çık"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "yönetici komutlarını gösterir"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "bunu gösterir"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "tüm kullanılabilir veriyi listeler"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "kart sahibinin ismini değiştirir"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "anahtarın alınacağı URL değiştirilir"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "kart URL'sinde belirtilmiş anahtarı alır"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "oturum açma ismini değiştirir"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "dil tercihlerini değiştirir"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "kart sahibinin cinsiyetini değiştirir"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "bir CA parmakizini değiştirir"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "imza zorlama PIN'i bayrağını değiştirir"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "yeni anahtarlar üretir"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "PIN'i değiştirme veya engelleme menüsü"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "PIN'i doğrular ve tüm veriyi listeler"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Yöneticiye özel komut\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Yönetici komutlarına izin verilir\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Yönetici komutlarına izin verilmez\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
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:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, 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: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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "anahtar bloğu okunurken hata: %s\n"
@@@ -2132,39 -1661,32 +2133,39 @@@ msgstr "genel anahtar \"%s\" için bir
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "%s şifrelemesi kullanılıyor\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' zaten sıkıştırılmış\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "UYARI: \"%s\" dosyası boş\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "`%s'den okunuyor\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2172,7 -1694,16 +2173,20 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
"zorlanıyor\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2181,38 -1712,32 +2195,39 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
"kullanılmak isteniyor\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s \"%s\" için şifrelendi\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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s şifreli veri\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "şifreli paketin elde edilmesinde sorun var\n"
@@@ -2299,39 -1807,30 +2314,39 @@@ msgstr "ihraç sırasında anahtardan m
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: atlandı: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "\"%s\"e yazıyor\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "gizli anahtarların ihracına izin verilmez\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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,228 -1889,181 +2418,234 @@@ msgstr "|İSİM|öntanımlı gizli anah
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, 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:3637
++#: g10/getkey.c:3658
#, 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:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, 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:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "bir imza yapar"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "açıkça okunabilen bir imza yapar"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "veriyi şifreler"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "bir imzayı doğrular"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "anahtarları listeler"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "anahtarları ve imzaları listeler"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "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 generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new 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 revoke a user-id"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtar zincirinden siler"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "anahtarları gönderir"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan indirir"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "bir anahtar sunucusunda anahtarları arar"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "kart durumunu basar"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "kart üzerindeki veriyi değiştirir"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "bir kartın PIN'ini değiştirir"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "ileti özetlerini gösterir"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "sunucu kipinde çalışır"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
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:564
++#: g10/gpg.c:567
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:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|çıktı DOSYAya yazılır"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2632,7 -2071,6 +2653,7 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2662,13 -2100,11 +2683,13 @@@ msgstr "
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, 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:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2683,7 -2119,6 +2704,7 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2691,81 -2126,66 +2712,81 @@@ msgstr "
"\n"
"Desteklenen algoritmalar:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "GenAnah: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Şifre: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Sıkıştırma: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "kullanımı: gpgsm [seçenekler] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2773,19 -2193,16 +2794,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:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2794,470 -2211,356 +2815,451 @@@ 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:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, 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:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, 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:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
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:1950
++#: g10/gpg.c:1955
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:1952
++#: g10/gpg.c:1957
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:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, 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:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
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:3247
++#: g10/gpg.c:3246
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:3249
++#: g10/gpg.c:3248
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:3251
++#: g10/gpg.c:3250
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:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "imzaları PKA verisi ile doğrular"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
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:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, 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:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, 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:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
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:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
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:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
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:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "kişisel özet tercihleri geçersiz\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, 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"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, 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:3984
++#: g10/gpg.c:4027
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:4056
++#: g10/gpg.c:4099
#, 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:4085
++#: g10/gpg.c:4128
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:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "%s kipindeyken --symmetric --encrypt kullanamazsınız\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
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:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, 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:4508
++#: g10/gpg.c:4554
#, 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:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, 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:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, 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:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@@ -3269,7 -2570,6 +3271,7 @@@ msgstr "|DOSYA|anahtarlar DOSYA anahta
msgid "make timestamp conflicts only a warning"
msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
@@@ -3300,144 -2595,120 +3302,150 @@@ msgstr "yardım mevcut değil
msgid "No help available for '%s'"
msgstr "\"%s\" için yardım mevcut değil"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "ithalat sonrası güvence veritabanını güncellemez"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "ithalat sonrası güvence veritabanını güncellemez"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "parmakizini gösterir"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "girdinin ikilik biçimde olduğu kabul edilir"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "parmakizini gösterir"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d türündeki blok atlanıyor\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "şu ana kadar %lu anahtar işlendi\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "İşlenmiş toplam miktar: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " kullanıcı kimliksiz: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " alınan: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " değişmedi: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " yeni kullanıcı kimliği: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " yeni yardımcı anahtarlar: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " yeni imzalar: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " yeni anahtar iptalleri: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gizli anahtarlar okundu: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " gizli anahtarlar indirildi: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " gizli anahtarlar değişmedi: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " alınamadı: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " temizlenen imzalar: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " temizlenen kullanıcı kimlikleri: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3446,197 -2717,159 +3454,197 @@@ msgstr "
"UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
"tercihler içeriyor:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": şifreleme algoritması %s için tercih edilir\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": özet algoritması %s için tercih edilir\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
" \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
"\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "tercihlerinizi güncellemenizi ve\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
"tekrar dağıtmanızı şiddetle öneririz.\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "anahtar %s: genel anahtar yok: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "anahtar %s: yeni anahtar - atlandı\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "anahtar %s: \"%s\" değişmedi\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "anahtar %s: gizli anahtar alındı\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "atlandı: gizli anahtar zaten var\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "gizli anahtar \"%s\" yok: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "gizli anahtarı alımına izin verilmez\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
@@@ -3651,147 -2884,120 +3659,147 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
"uygulanamaz\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr ""
"anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
"desteklenmiyor\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr ""
"anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "anahtar %s: yardımcı anahtar atlandı\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
"anahtarı %s alınıyor\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
"anahtarı %s mevcut değil.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
@@@ -3837,86 -3036,12 +3845,15 @@@ msgstr "'%s' açılırken hata: %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[yürürlükten kaldırma]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[öz-imza]"
- #: 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"
- msgstr "yeterli bellek ayrılırken hata: %s\n"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "kart %s özet algoritmasını desteklemiyor\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "Good signature from"
- msgid " (reordered signatures follow)"
- msgstr "Buradaki imzeler iyi:"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
- msgid "key %s:\n"
- msgstr "\"%s\" atlandı: %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
- msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
- msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d kötü imza\n"
- msgstr[1] "%d kötü imza\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "Buradaki imzeler iyi:"
- msgstr[1] "Buradaki imzeler iyi:"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3927,17 -3052,14 +3864,17 @@@ msgstr "
"derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
"kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Şöyle böyle güveniyorum\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Tamamen güveniyorum\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3947,50 -3069,38 +3884,50 @@@ msgstr "
"1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
"güvence imzaları yapmayı mümkün kılar.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
- #: g10/keyedit.c:2258 g10/keyedit.c:3261
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " İmzalanamıyor.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kullanıcı kimliği \"%s\" imzalanabilir. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "İmzalayacak mısınız? (e/H veya y/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3999,12 -3109,10 +3936,12 @@@ msgstr "
"\"%s\" üzerindeki öz-imza\n"
"bir PGP 2.x tarzı imza.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4013,13 -3121,11 +3950,13 @@@ msgstr "
"\"%s\" üzerindeki imzanızın\n"
"kullanım süresi dolmuş.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H "
"veya y/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4028,46 -3134,37 +3965,46 @@@ msgstr "
"\"%s\" üzerindeki imzanız\n"
"dahili bir imza.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H veya "
"y/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Bu anahtarın kullanım süresi dolmuş!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"İmzanızın da aynı süreyle geçerli olmasını ister misiniz? (E/h veya Y/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4076,33 -3173,27 +4013,33 @@@ msgstr "
"Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
"doğruladınız? Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Cevabı bilmiyorum. %s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Tamamen kontrol edildi.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) İlişkisel denetim yaptım.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Çok dikkatli bir denetim yaptım.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4112,232 -3203,178 +4049,232 @@@ msgstr "
"gerçekten\n"
"emin misiniz?\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Bu bir öz-imza olacak.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Bu anahtarı çok dikkatle sınadım.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Gerçekten imzalayacak mısınız? (e/H veya 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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama başarısız: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
"değiştirilecek bir anahtar parolası yok.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "kaydet ve çık"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "parmakizini gösterir"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "anahtarı ve kullanıcı kimliğini gösterir"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "N kullanıcı kimliğini seçer"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "N yardımcı anahtarını"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "imzaları sınar"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "kullanıcı kimlikleri yerel olarak imzalar"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "bir kullanıcı kimliği ekler"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "bir foto kimliği ekler"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "seçili kullanıcı kimlikleri siler"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "bir yardımcı anahtar ekler"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "bir akıllı karta bir anahtar ekler"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "bir akıllı karttan bir anahtarı taşır"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "seçili yardımcı anahtarları siler"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "bir yürürlükten kaldırma anahtarı ekler"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "seçili kullanıcı kimliklerden imzaları siler"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
"anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
"değiştirir"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "seçili kullanıcı kimliğini asıl olarak imler"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "tercihleri listeler (uzman)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "tercihleri listeler (ayrıntılı)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
"belirler"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "anahtar parolasını değiştirir"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "sahibiningüvencesini değiştirir"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "anahtarı kullanıma sokar"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "anahtarı iptal eder"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "seçili foto kimlikleri gösterir"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
"anahtardan kaldırır"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
"kaldırır"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Gizli anahtar mevcut.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4356,302 -3393,250 +4293,314 @@@ msgstr "
" için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı olarak "
"(ltsign, tnrsign gibi).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Anahtar yürürlükten kaldırıldı."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "imza türü `%s' bilinmiyor\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr ""
"Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Bu öz-imza gerçekten taşınacak mı? (e/H ya da y/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "En az bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
"ya da y/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr ""
"Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr ""
"Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
"da y/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr ""
"Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
"(e/H ya da y/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr ""
"Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
"ya da y/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
"sahibiningüvencesi belirlenemez\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Belirlenecek tercih listesi:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
"musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Kaydetmeden çıkılsın mı? (e/H ya da 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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "güncelleme başarısız: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "güvence listesinin sınanması başarısız: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "güvence listesinin sınanması başarısız: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "parmakizi geçersiz"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "parmakizinin alınması başarısız oldu\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "değer hatalı\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Böyle bir kullanıcı kimliği yok.\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "invalid fingerprint"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "parmakizi geçersiz"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "anahtar \"%s\" yok: %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Özet: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Özellikler: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Anahtar sunucusu değişmez"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Tercih edilen anahtar sunucusu: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Simgelemler: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr ""
"Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
"kaldırılmış\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr ""
"Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(duyarlı)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "oluşturuldu: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "yürürlükten kaldırıldı: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "kullanımı: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "kart-no: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "güvencesi: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "geçerliliği: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Bu anahtar iptal edilmişti"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4659,18 -3644,12 +4608,18 @@@ msgstr "
"Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
"doğrulukta olmayacağını lütfen gözönüne alınız.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "zamanaşımına uğradı"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4679,17 -3658,14 +4628,17 @@@ msgstr "
" farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
" kabul edilmesini sağlayabilirsiniz.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4698,35 -3674,27 +4647,35 @@@ msgstr "
"UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
" bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4734,20 -3702,16 +4683,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d imza silindi.\n"
msgstr[1] "%d imza silindi.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Hiçbir şey silinmedi.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "geçersiz"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4755,17 -3719,14 +4704,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4775,47 -3736,39 +4724,47 @@@ msgstr "
" eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
" ile sonuçlanabilir.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
"ekleyemeyebilirsiniz.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr ""
"Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
"olarak atanamaz\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
"kullanamazsınız\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
" kullanılamaz!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
"misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4826,180 -3779,148 +4775,186 @@@ msgstr "
"Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
"misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
"gerekmiyor\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Tercih ettiğiniz sunucunun adresini girin: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Devam? (e/H ya da y/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "%s çittirmeli kullanıcı kimliği yok\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Kullanıcı kimliği: \"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (dışarda geçersiz)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H veya "
"y/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (yürülükten kaldırılmaz)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
"Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H "
"veya y/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
"gösteriliyor\n"
++#: g10/keygen.c: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/keygen.c:317
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
@@@ -5450,8 -4294,6 +5405,8 @@@ msgstr "
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
@@@ -5528,7 -4357,6 +5483,7 @@@ msgstr "`%s' genel anahtarlığa yazıl
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5536,14 -4364,12 +5491,14 @@@ msgstr "
"Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
"\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5551,50 -4377,39 +5506,50 @@@ msgstr "
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "asla "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritik imza guvencesi: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "imza guvencesi: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Kritik tercihli anahtar sunucusu: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Kritik imza simgelemi: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "imza simgelemi: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5602,7 -4417,20 +5557,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d kötü imza\n"
msgstr[1] "%d kötü imza\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d kötü imza\n"
+ msgstr[1] "%d kötü imza\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
+ msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5610,40 -4438,32 +5581,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 imza bir hata yüzünden kontrol edilmedi\n"
msgstr[1] "1 imza bir hata yüzünden kontrol edilmedi\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Anahtar zinciri"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Anahtar parmakizi ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " Kart seri no. ="
@@@ -5754,266 -4553,217 +5725,272 @@@ msgstr "anahtar, anahtar sunucusunda yo
msgid "no keyserver known (use option --keyserver)\n"
msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "%s anahtarı %s adresinden isteniyor\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "bir anahtar sunucusu eylemi yok!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "%s anahtarı %s adresine gönderiliyor\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "%s anahtarı %s adresinden isteniyor\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s şifreli oturum anahtarı\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "bilinmeyen özet algoritması ile üretilmiş anahtar parolası %d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "genel anahtar: %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "genel anahtarla şifreli veri: doğru DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
"oluşturuldu\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "genel anahtar şifre çözümü başarısız: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu anahtar parolası ile şifrelenmiş\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "1 anahtar parolası ile şifrelenmiş\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s şifreli veri varsayılıyor\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "UYARI: ileti bütünlük korumalı değildi\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "Şifre çözme tamam\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "şifre çözme başarısız: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "özgün dosya adı = '%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "UYAR: çok sayıda salt metin görüldü\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "hiç imza yok\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\" deki imza KÖTÜ"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\" deki imza zamanaşımına uğramış"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\" deki imza iyi"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "imza doğrulama engellendi\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "bu belirsiz imza verisi elde edilemiyor\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "İmza %s de\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " %s kullanılarak anahtar %s ile yapılmış\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " nam-ı diğer \"%s\""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Anahtar burada:"
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[şüpheli]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " nam-ı diğer \"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Bu imzanın geçerliliği %s de bitti.\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s imzası, %s özet algoritması\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "ikili"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "metinkipi"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "bilinmeyen"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritma: %s"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "İmza kontrol edilemedi: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "bir bağımsız imza değil\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x sınıfı tek başına imza\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "eski stil (PGP 2.x) imza\n"
@@@ -6074,72 -4813,59 +6051,72 @@@ msgstr "`%s' için okuma hatası: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, 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:1151
++#: g10/misc.c:1063
#, 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:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "lütfen yerine \"%s%s\" kullanınız\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, 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:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Sıkıştırılmamış"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "Sıkıştırılmamış|yok"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "bu ileti %s tarafından kullanılamayabilir\n"
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "`%s' seçeneği belirsiz\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
#, 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:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6663,36 -5290,34 +6640,42 @@@ msgstr "imzalı veri '%s' açılamadı
msgid "can't open signed data fd=%d: %s\n"
msgstr "imzalı veri fd=%d açılamadı: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "sertifika şifreleme için elverişli değil\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "tamam, biz anonim alıcıyız.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "DEK'in eski kodlaması desteklenmiyor\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6859,7 -5456,6 +6842,7 @@@ msgstr "(açıklama verilmedi)\n
msgid "Is this okay? (y/N) "
msgstr "Bu tamam mı? (e/H ya da y/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
@@@ -6882,27 -5475,27 +6865,33 @@@ msgstr "%s anahtarı, güvensiz bir çi
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA anahtarı %s, %u bitlik veya daha geniş bir çittirim gerektiriyor\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "UYARI: iletideki imza özeti çelişkili\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6910,7 -5503,6 +6899,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6918,7 -5510,6 +6907,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6931,7 -5522,6 +6920,7 @@@ msgstr[0] "
msgstr[1] ""
"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6943,45 -5533,38 +6932,45 @@@ msgstr[0] "
msgstr[1] ""
"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "BİLGİ: imza anahtarı %s yürürlükten kaldırılmıştı\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
"kaynaklandığı sanılıyor\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"UYARI: %% genişletmeli simgelem imkansız (çok büyük). Genişletilmeden "
"kullanılıyor.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6989,7 -5572,6 +6978,7 @@@ msgstr "
"UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
"Uzatılmadan kullanılıyor.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6998,12 -5580,10 +6987,12 @@@ msgstr "
"UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
"(çok büyük). Uzatılmadan kullanılıyor.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s imza: \"%s\" den\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7011,29 -5591,23 +7000,29 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
"isteniyor\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "imzalanıyor:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s şifrelemesi kullanılmayacak\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
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:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" atlandı: tekrarlanmış\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "atlandı: gizli anahtar zaten var\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
@@@ -7121,7 -5679,6 +7110,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:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7234,149 -5769,121 +7223,149 @@@ msgstr "%d karakterden daha uzun metin
msgid "input line longer than %d characters\n"
msgstr "girdi satırı %d karakterden daha uzun\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "desteklenmeyen algoritma: %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "geçici dosya oluşturulurken hata: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: dizin kaydını yazma hatası: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "'%s' açılırken hata: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, 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:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "geçerliliği: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, 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:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "anahtarları listeler"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7384,7 -5891,6 +7373,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7392,7 -5898,6 +7381,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:1835
++#: g10/tofu.c:1834
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7400,7 -5905,6 +7389,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:1839
++#: g10/tofu.c:1838
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7408,54 -5912,46 +7397,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7464,108 -5960,90 +7453,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "anahtarı yazarken hata: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, 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:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d imza silindi.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7573,13 -6051,11 +7562,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "%lu anahtar parolası ile şifrelenmiş\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7587,31 -6063,25 +7576,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "geçerliliği: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7628,19 -6098,15 +7617,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, 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:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7887,19 -6308,14 +7876,19 @@@ msgstr "
"Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
"Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@@ -7948,44 -6355,35 +7937,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "parmakizinin saklanması başarısız oldu: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "karttan CHV durumu alınırken hata\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "yanıt RSA modülü içermiyor\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "yanıt RSA genel bileşenini içermiyor\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public key\n"
msgstr "yanıt RSA genel bileşenini içermiyor\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "yanıt genel anahtar verisi içermiyor\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "genel anahtar okuması başarısız: %s\n"
@@@ -7993,57 -6391,46 +7982,57 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"%s olarak öntanımlı PIN kullanılamadı: %s - öntanımlı kullanımı iptal "
"ediliyor\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Lütfen PIN'i giriniz"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "kart kalıcı olarak kilitli!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -8056,24 -6443,19 +8045,24 @@@ msgstr[1] "
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "||Lütfen PIN'i giriniz"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Lütfen PIN'i giriniz"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
@@@ -8081,83 -6463,65 +8070,83 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|YSK|Yeni Sıfırlama Kodu"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|YYP|Yeni Yönetici PIN'i"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Yeni PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||Lütfen PIN'i giriniz"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please enter the PIN and New PIN"
msgstr "||Lütfen PIN'i giriniz"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "uygulama verisi okunurken hata\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "parmakizi DO okunurken hata\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "anahtar zaten mevcut\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "mevcut anahtar konulacak\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "yeni anahtar üretiliyor\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "yeni anahtar üretiliyor\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "oluşturum zaman damgası kayıp\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "anahtarın saklanması başarısız: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported algorithm: %s"
msgid "unsupported curve\n"
msgstr "desteklenmeyen algoritma: %s"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "anahtar üretimi başarısızlığa uğradı\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -8165,30 -6529,24 +8154,30 @@@ msgid_plural "key generation completed
msgstr[0] "anahtar üretimi tamamlandı (%d saniye)\n"
msgstr[1] "anahtar üretimi tamamlandı (%d saniye)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kart %s özet algoritmasını desteklemiyor\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@@ -8210,11 -6565,9 +8199,11 @@@ msgstr "|N|İlk Yeni PIN
msgid "run in multi server mode (foreground)"
msgstr "çoklu sunucu kipinde çalışır (önalanda)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|DOSYA|DOSYAya bir günce yazar"
@@@ -8280,12 -6622,10 +8269,12 @@@ msgstr "
"Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
"kullanın\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %d için eylemci başlatıldı\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %d için eylemci sonlandı\n"
@@@ -8361,9 -6686,6 +8350,9 @@@ msgstr "eşleşen sertifika sayısı: %
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
@@@ -8536,7 -6818,6 +8525,7 @@@ msgstr "kullanılan geçerlilik modeli
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(bu, MD2 algoritmasıdır)\n"
@@@ -8579,7 -6853,6 +8568,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
@@@ -8866,11 -7086,9 +8855,11 @@@ msgstr "Hazır. Bu isteği şimdi Sert
msgid "resource problem: out of core\n"
msgstr "özkaynak sorunu: nüve dışı\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(bu, RC2 algoritmasıdır)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
@@@ -8902,131 -7115,100 +8891,131 @@@ msgstr "sertifika `%s' silindi\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "\"%s\" sertifikası silinemedi: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "geçerli alıcılar verilmedi\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "harici anahtarları listeler"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "sertifika zincirini listeler"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "sertifikaları ithal eder"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "sertifikaları ihraç eder"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "bir akıllı kartı kayda alır"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "gpg-protect-tool'u çalıştırır"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "base-64 kodlu çıktı oluşturur"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "girdinin PEM biçiminde olduğu kabul edilir"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "girdinin ikilik biçimde olduğu kabul edilir"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "asla bir CRL sormaz"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "doğruluğu OCSP kullarak sınar"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|içerilecek sertifika sayısı"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "sertifika poliçeleri sınanmaz"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "kayıp sertifikacı sertifikalarını alır"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "terminali hiç kullanma"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "soruların çoğunda cevap evet farzedilir"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "soruların çoğunda cevap hayır farzedilir"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
"|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
"kullanılır"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -9041,50 -7223,41 +9030,50 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "BİLGİ:`%s'e şifrelenemez: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "`%s' geçerlilik modeli bilinmiyor\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: konak adı belirtilmemiş\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: kullanıcısız parola verilmiş\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: bu satır atlanıyor\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "anahtar sunucusu çözümlenemedi\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "`%s' kullanarak imzalanamıyor: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@@ -9145,7 -7306,6 +9134,7 @@@ msgstr "sertifika yeniden aranırken so
msgid "error storing flags: %s\n"
msgstr "bayraklar saklanırken hata: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Hata - "
@@@ -9181,7 -7337,6 +9170,7 @@@ msgstr "
"\n"
"%s%sBunu yapmak istediğinizden emin misiniz?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -9200,49 -7354,39 +9189,49 @@@ msgstr "
"\"%s\"\n"
"Bu sertifkanın nitelikli bir imza üretmeyeceğine dikkat ediniz!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"çittirim algoritması %d (%s) imzacı %d için desteklenmiyor; %s kullanılıyor\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "%d imzacı için kullanılan çittirim algoritması: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "nitelikli sertifika için sınama başarısız: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "İmza "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[belirtilmeyen tarihte]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " sertifika kimliği 0x%08lX kullanılarak yapıldı\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr "geçersiz imza: ileti özeti özelliği hesaplananla uyuşmuyor\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Buradaki imzeler iyi:"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " nam-ı diğer"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Bu bir nitelikli imzadır.\n"
@@@ -10122,126 -8105,98 +10111,126 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "|FILE|run commands from FILE on startup"
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10254,13 -8209,11 +10243,13 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10272,88 -8225,71 +10261,88 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "kullanımı: gpgsm [seçenekler] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
#| msgid "line too long - skipped\n"
msgid "%s:%u: line too long - skipped\n"
msgstr "satır çok uzun - atlandı\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "parmakizi geçersiz"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "`%s' için okuma hatası: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "zorlanmadı"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10543,7 -8443,16 +10532,20 @@@ msgstr "'%s' bir JPEG dosyası değil\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ #| msgid "error running `%s': exit status %d\n"
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
+
++#: dirmngr/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"
+ msgstr "yeterli bellek ayrılırken hata: %s\n"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
#| msgid "error writing to %s: %s\n"
msgid "error printing log line: %s\n"
@@@ -10615,12 -8512,10 +10617,12 @@@ msgstr "anahtar %1$s, %3$s sunucusunun
msgid "malloc failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10692,13 -8575,6 +10694,7 @@@ msgstr "`%s' yazılırken hata: %s\n
msgid "error reading HTTP response for '%s': %s\n"
msgstr "%s okunurken hata: %s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- #| msgid "error running `%s': exit status %d\n"
- msgid "error accessing '%s': http status %u\n"
- msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
@@@ -10831,86 -8683,70 +10827,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "satır göndirimi başarısız: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "satır göndirimi başarısız: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
#| msgid "cannot allocate outfile string: %s\n"
msgid "can't allocate control structure: %s\n"
msgstr "dosya dışı dizge ayrılamıyor: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
#| msgid "failed to create stream from socket: %s\n"
msgid "failed to allocate assuan context: %s\n"
msgstr "sokette akım oluşturulamadı: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -11064,196 -8871,149 +11060,196 @@@ msgstr "satır göndirimi başarısız
msgid "error sending standard options: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
- #: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Tanı çıktısını denetleyen seçenekler"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Yapılandırmayı denetleyen seçenekler"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Hata ayıklamaya elverişli seçenekler"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Güvenliği denetleyen seçenekler"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|yeni anahtar parolası için gereken en küçük uzunluk N'ye ayarlanır"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
"|N|yeni bir anahtar parolası için en azından harf olmayan N karakter gerekir"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|DOSYA|yeni anahtar parolası DOSYAdaki kalıba göre sınanır"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|anahtar parolası N gün sonra zaman aşımına uğrar"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|İSİM|İSİM kullanıcısı için de şifreleme yapar"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Anahtar sunucular için yapılandırma"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
"|MEKANİZMALAR|anahtarları eposta adreslerine göre konumlamak için "
"MEKANİZMALAR kullanılır"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "dirmngr'a tüm erişim iptal edilir"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|İSİM|PKCS#12 anahtar parolaları için kodlama olarak İSİM kullanılır"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "kök sertifikalar için CRLler sınanmaz"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Çıktı biçimini denetleyen seçenekler"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Güvenliği denetleyen seçenekler"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "HTTP sunucuları için yapılandırma"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "sistemin HTTP vekil ayarları kullanılır"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Kullanılacak LDAP sunucularının yapılandırması"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "LDAP sunucu listesi"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "OCSP için yapılandırma"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Anahtar Parolası hatalı"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Bileşen yok"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing '%s'\n"
msgstr "%s kapanırken hata: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -11335,13 -9079,11 +11331,13 @@@ msgstr "çıktı dosyası olarak kullan
msgid "activate changes at runtime, if possible"
msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11353,15 -9095,12 +11349,15 @@@ msgstr "
"Sözdizimi: gpgconf [seçenekler]\n"
"GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Tek bileşenlik değiştirge gerekli"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Bileşen yok"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Değiştirgeye izin verilmez"
diff --cc po/uk.po
index ca0d8c0,818b731..b893823
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -19,7 -18,6 +19,7 @@@
"%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "не вдалося встановити блокування запису пінкоду: %s\n"
@@@ -30,45 -28,35 +30,45 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "_Гаразд"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "_Скасувати"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr "_Так"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr "_Ні"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "Пінкод:"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr "_Зберегти у засобі керування паролями"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "Справді хочете зробити пароль видимим на екрані?"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr "Зробити пароль видимим"
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
msgid "|pinentry-tt|Hide passphrase"
msgstr "Приховати пароль"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "Якість:"
@@@ -78,13 -66,11 +78,13 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Якість введеного вище тексту.\n"
"Дані щодо критеріїв якості можна отримати у вашого адміністратора."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -92,7 -78,6 +92,7 @@@ msgstr "
"Будь ласка, вкажіть ваш пінкод, щоб ключ можна було розблокувати для цього "
"сеансу"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -100,53 -85,40 +100,53 @@@ msgstr "
"Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
"сеансу"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr "Пінкод:"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "Пароль:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "паролі не збігаються, повторіть спробу"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (спроба %d з %d)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "Повторіть:"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "Занадто довгий пінкод"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "Занадто довгий пароль"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "Некоректні символи у пінкоді"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "Занадто короткий пінкод"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "Помилковий пінкод"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "Помилковий пароль"
@@@ -156,57 -127,35 +156,57 @@@ msgid "ssh keys greater than %d bits ar
msgstr ""
"підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не вдалося створити «%s»: %s\n"
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "виявлено картку з серійним номером: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "на карті немає ключа розпізнавання для SSH: %s\n"
- #: agent/command-ssh.c:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "не виявлено відповідних ключів картки: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "Надати"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "Заборонити"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Будь ласка, повторіть введення пароля"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -241,63 -185,49 +241,63 @@@ msgstr "
"Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A %s"
"%%0A %s%%0Aу сховищі ключів gpg-agent"
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "не вдалося створити потік даних з сокета: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "Будь ласка, вставте картку з серійним номером"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "Будь ласка, вийміть поточну картку і вставте картку з серійним номером"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "Адміністративний пінкод"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PUK"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "Код скидання"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AСкористайтеся додатковою клавіатурою зчитувача для введення."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "Повторіть введення цього коду скидання"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "Повторіть введення цього PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "Повторіть введення цього пінкоду"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "Помилка під час повторного введення коду скидання, повторіть спробу"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "Помилка під час повторного введення PUK, повторіть спробу"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "Помилка під час повторного введення пінкоду, повторіть спробу"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Будь ласка, введіть пінкод%s%s%s для розблокування картки"
@@@ -376,8 -293,6 +376,8 @@@ msgstr "Вкажіть пароль д�
msgid "Please enter the new passphrase"
msgstr "Вкажіть новий пароль"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -385,132 -300,96 +385,136 @@@ msgstr "
"@Параметри:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "запустити у режимі фонової служби (фоновий)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "запустити у режимі сервера (основному)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
msgid "run in supervised mode"
msgstr "запустити у режимі із наглядом"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "дещо зменшити кількість повідомлень"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "виведення команд у форматі sh"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "виведення команд у форматі csh"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FILE|прочитати параметри з вказаного файла"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "не від’єднувати від консолі"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "не захоплювати керування клавіатурою і мишею"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "використовувати файл журналу для сервера"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|використовувати вказану програму пінзаписів"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|використовувати вказану програму SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "не використовувати SCdaemon"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|приймати певні команди через NAME"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "ігнорувати запити щодо зміни TTY"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "ігнорувати запити щодо зміни графічного дисплея"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|вважати кешовані пінкоди за вказану кількість секунд"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "не використовувати кеш пін-кодів для підписування"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "disallow the use of an external password cache"
msgstr "заборонити використання зовнішнього кешу паролів"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "заборонити клієнтам позначати ключі як надійні"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "дозволити попереднє встановлення пароля"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr "заборонити функції виклику перевизначати pinentry"
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr "дозволити запит пароля з Emacs"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "увімкнути підтримку ssh"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Використання: @GPG_AGENT@ [параметри] (-h — довідка)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -518,146 -397,112 +522,151 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
"Керування закритими ключами у @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "вказано некоректне значення рівня діагностики «%s»\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметрів «%s»: %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "не вдалося створити сокет: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "назва сокета «%s» є надто довгою\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "помилка під час спроби отримання поточного стану сокета\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не вдалося встановити права доступу до «%s»: %s\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "помилка listen(): %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
msgid "listening on socket '%s'\n"
msgstr "очікування даних на сокеті «%s»\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 g10/openfile.c:398
+#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "створено каталог «%s»\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "помилка stat() щодо «%s»: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "не можна використовувати як домашній каталог «%s»\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr ""
"помилка під час спроби читання поточного стану на файловому дескрипторі %d: "
"%s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
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:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "помилка pth_select: %s — очікування у 1 с\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s зупинено\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "у цьому сеансі не запущено gpg-agent\n"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr ""
"Використання: gpg-preset-passphrase [параметри] KEYGRIP (-h — довідка)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -665,8 -510,6 +674,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
"Керування кешем паролів\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -674,9 -517,6 +683,9 @@@ msgstr "
"@Команди:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -730,8 -562,6 +739,8 @@@ msgstr "скасовано\n
msgid "error while asking for the passphrase: %s\n"
msgstr "помилка під час спроби запиту пароля: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "помилка під час відкриття «%s»: %s\n"
@@@ -791,8 -612,6 +800,8 @@@ msgstr "
msgid "Yes"
msgstr "Так"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "Ні"
@@@ -847,7 -659,6 +856,7 @@@ msgstr "Змінити пароль
msgid "I'll change it later"
msgstr "Я зміню його пізніше"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -855,11 -666,9 +864,11 @@@
msgstr ""
"Справді хочете вилучити ключ, що визначається keygrip%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "Вилучити ключ"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -882,7 -688,6 +891,7 @@@ msgstr "Ключ %s використо�
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "%zu-бітовий хеш не є коректним для %u-бітового ключа %s\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "невдала спроба перевірити створений підпис: %s\n"
@@@ -921,8 -716,6 +930,8 @@@ msgstr "помилка під час с
msgid "error creating a stream for a pipe: %s\n"
msgstr "помилка під час спроби створення потоку для каналу: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "помилка під час спроби розгалужування процесу: %s\n"
@@@ -1049,7 -816,6 +1058,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr "вихід за межі області під час спроби отримання %lu байтів"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "помилка під час спроби розподілу пам’яті: %s\n"
@@@ -1064,7 -828,6 +1073,7 @@@ msgstr "%s:%u: застарілий п�
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "невідомий прапорець діагностики «%s» проігноровано\n"
@@@ -1168,8 -908,6 +1177,8 @@@ msgstr "Створено ключ се�
msgid "algorithm: %s"
msgstr "алгоритм: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "непідтримуваний алгоритм: %s"
@@@ -1335,7 -1035,6 +1344,7 @@@ msgstr "некоректний пара
msgid "missing argument for option \"%.50s\"\n"
msgstr "не вказано аргументу до параметра «%.50s»\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "некоректний аргумент параметра «%.50s»\n"
@@@ -1360,7 -1055,6 +1369,7 @@@ msgstr "параметр «%.50s» є �
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда «%.50s» є неоднозначною\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "вихід за межі області пам’яті\n"
@@@ -1418,8 -1101,6 +1427,8 @@@ msgstr "блокування «%s» н�
msgid "waiting for lock %s...\n"
msgstr "очікування на блокування %s…\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
@@@ -1540,7 -1195,6 +1549,7 @@@ msgstr "назва примітки м�
msgid "WARNING: invalid notation data found\n"
msgstr "УВАГА: виявлено некоректні дані примітки\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "не вдалося пропустити через проксі запит %s до клієнта\n"
@@@ -1549,33 -1202,31 +1558,40 @@@
msgid "Enter passphrase: "
msgstr "Введіть пароль: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, c-format
msgid "error getting version from '%s': %s\n"
msgstr "помилка під час спроби отримання даних щодо версії з «%s»: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr "сервер «%s» має версію, старішу за нашу (%s < %s)"
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, c-format
msgid "WARNING: %s\n"
msgstr "УВАГА: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s ще не може працювати разом з %s\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Не вдалося отримати доступ до картки OpenPGP: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Виявлено картку OpenPGP з номером %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "це не можна робити у пакетному режимі\n"
@@@ -1583,14 -1233,9 +1599,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "Цією командою можна користуватися лише для карток версії 2\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "Немає коду скидання або код скидання вже недоступний\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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "Ваш вибір? "
@@@ -1648,92 -1280,55 +1664,75 @@@ msgstr "Помилка: складен�
msgid "URL to retrieve public key: "
msgstr "Адреса для отримання відкритого ключа: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
msgid "error reading '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "Дані користувача (назва запису): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr ""
- "Помилка: дані користувача є занадто довгими (максимум — %d символів).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "Особисті дані DO: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr ""
- "Помилка: особисті дані D0 є занадто довгими (максимум — %d символів).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "Основна мова: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "Помилка: некоректна довжина рядка основної мови.\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "Помилка: некоректні символи у рядку основної мови.\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Стать (чоловіча (M), жіноча (F) або пробіл): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "Помилка: некоректна відповідь.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "Відбиток CA: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Помилка: некоректне форматування відбитка.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "дія над ключем неможлива: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "не є карткою OpenPGP"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "помилка під час отримання даних поточного ключа: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "Замінити вже створений ключ? (y/N або т/Н) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1744,56 -1339,44 +1743,56 @@@ msgstr "
" ознайомтеся з документацією до вашої картки, щоб\n"
" визначити дозволені розміри.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Якому розміру ключа підписування ви надаєте перевагу? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Яким має бути розмір ключа для шифрування? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлено до %u бітів\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "помилка під час спроби зміни розміру ключа з %d на %u: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Створити резервну копію ключа шифрування поза карткою? (Y/n або Т/н) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "Замірити вже створені ключі? (y/N або т/Н) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1804,164 -1387,120 +1803,164 @@@ msgstr "
" PIN = «%s» Адміністративний PIN = «%s»\n"
"Вам слід змінити параметри за допомогою команди --change-pin\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "Виберіть тип ключа, який слід створити:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) Ключ підписування\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) Ключ шифрування\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) Ключ розпізнавання\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "Некоректний вибір.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "Виберіть сховище для зберігання ключа:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Помилка KEYTOCARD: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
msgid "This command is not supported by this card\n"
msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr ""
"Зауваження: у результаті виконання цієї команди усі ключі на картці буде "
"знищено!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
msgid "Continue? (y/N) "
msgstr "Продовжити? (y (так)/N (ні)) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
"Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "вийти з цього меню"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "показати керівні команди"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "показати цю довідкову інформацію"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "показати всі доступні дані"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "змінити ім’я власника картки"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "змінити адресу для отримання ключа"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "отримати ключ, вказаний у полі адреси картки"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "змінити ім’я користувача"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "змінити основну мову"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "змінити поле статі власника картки"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "змінити відбиток CA"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "увімкнути або вимкнути позначку примусового пінкоду підпису"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "створити ключі"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "меню зміни або розблокування пінкоду"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "перевірити пінкод і показати список всіх даних"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "розблокувати під коду за допомогою коду скидання"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr "знищити усі ключі і дані"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/картка> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "Команда адміністратора\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "Команди адміністрування дозволено\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "Команди адміністрування заборонено\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "Некоректна команда (скористайтеся командою «help»)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output не працює з цією командою\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ «%s» не знайдено: %s\n"
- #: 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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "помилка під час спроби читання блокування ключа: %s\n"
@@@ -2019,36 -1546,29 +2018,36 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "помилка під час спроби створення пароля: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "не можна використовувати симетричний пакет ESK через режим S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "використано шифр %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "«%s» вже стиснено\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "УВАГА: файл «%s» є порожнім\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "читання з «%s»\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2056,7 -1576,16 +2055,20 @@@ msgstr "
"УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
"параметрам отримувача\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2065,40 -1594,34 +2077,41 @@@ msgstr "
"УВАГА: примусове використання алгоритму стиснення %s (%d) не відповідає "
"параметрам отримувача\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"примусове використання симетричного шифру %s (%d) не відповідає параметрам "
"отримувача\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для «%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "не можна використовувати %s у режимі %s\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "Дані, зашифровані за алгоритмом %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"УВАГА: повідомлення зашифровано слабким ключем з симетричним шифруванням.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "проблема з обробкою зашифрованого пакета\n"
@@@ -2184,36 -1690,27 +2197,36 @@@ msgstr "вилучити максиму
msgid "use the GnuPG key backup format"
msgstr "використовувати формат резервних копій ключів GnuPG"
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "записуємо до «%s»\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "експортування закритих ключів заборонено\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "УВАГА: нічого не експортовано\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2278,217 -1762,169 +2291,222 @@@ msgstr "використовуємо «
msgid "all values passed to '%s' ignored\n"
msgstr "усі значення, передані «%s», проігноровано\n"
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
"uid\n"
- #: g10/getkey.c:3637
++#: g10/getkey.c:3658
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "використовуємо підключ %s замість основного ключа %s\n"
- #: g10/gpg.c:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "коректні значення параметра «%s»:\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "створити підпис"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "створити текстовий підпис"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "створити від’єднаний підпис"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "зашифрувати дані"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "шифрувати лише за допомогою симетричного шифру"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "розшифрувати дані (типова дія)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "перевірити підпис"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "показати список ключів"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "показати список ключів і підписів"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "показати список і перевірити підписи ключів"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "показати список ключів і відбитків"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "показати список закритих ключів"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "створити пару ключів"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "швидке створення пари ключів"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
msgid "quickly add a new user-id"
msgstr "швидке додавання нового ідентифікатора користувача"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly revoke a user-id"
msgstr "швидке відкликання ідентифікатора користувача"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "quickly set a new expiration date"
msgstr "швидке встановлення нової дати завершення строку дії"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "повноцінне створення пари ключів"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "створити сертифікат відкликання"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "вилучити ключі з відкритого сховища ключів"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "вилучити ключів з закритого сховища ключів"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "швидко підписати ключ"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "швидко підписати ключ локально"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "підписати ключ"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "підписати ключ локально"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "підписати або редагувати ключ"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "змінити пароль"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "експортувати ключі"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "експортувати ключі на сервер ключів"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "імпортувати ключі з сервера ключів"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "шукати ключі на сервері ключів"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "оновити всі ключів з сервера ключів"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "імпортувати/об’єднати ключі"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "показати дані про стан картки"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "змінити дані на картці"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "змінити пінкод картки"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "оновити базу даних довіри"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "показати контрольні суми повідомлень"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "запустити у режимі сервера"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|встановити вказане правило TOFU для ключа"
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "створити дані у форматі ASCII"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|USER-ID|використовувати для створення підписів або розшифрування вказаний "
"ідентифікатор"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "використовувати канонічний текстовий режим"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|FILE|записати дані до вказаного файла"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "не вносити змін"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "запитувати перед перезаписом"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "строго використовувати стандарт OpenPGP"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2497,7 -1933,6 +2515,7 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man))\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
msgid ""
"@\n"
"Examples:\n"
@@@ -2518,11 -1953,9 +2536,11 @@@ msgstr "
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2532,7 -1965,6 +2550,7 @@@ msgstr "
"Підписування, перевірка підписів, шифрування або розшифрування\n"
"Типова дія залежатиме від вхідних даних\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2540,76 -1972,61 +2558,76 @@@ msgstr "
"\n"
"Підтримувані алгоритми:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "Відкритий ключ: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "Шифр: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "Хеш: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "Стиснення: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "користування: %s [параметри] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "несумісні команди\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "у визначенні групи «%s» немає знаку «=»\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2617,21 -2034,18 +2635,21 @@@ msgstr "
"УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
"«%s» не є безпечним\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2639,460 -2053,351 +2657,446 @@@ msgstr "
"УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "невідомий пункт налаштувань «%s»\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "показувати фотоідентифікатори у списках ключів"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "показувати дані щодо використання ключа у списках ключів"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "показувати адреси правил у списках підписів"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "показувати всі примітки у списках підписів"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "показувати стандартні примітки IETF у списках підписів"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "показувати примітки користувача у списках підписів"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "показувати адреси основних серверів ключів у списках підписів"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"ключів"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "показувати відкликані та застарілі підключі у списках ключів"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "показувати назву сховища ключів у списках ключів"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "показувати дати завершення строків дії у списку підписів"
- #: g10/gpg.c:2058 g10/gpg.c:2095
- #, c-format
- msgid "valid values for option '%s':\n"
- msgstr "коректні значення параметра «%s»:\n"
-
- #: g10/gpg.c:2069
++#: g10/gpg.c:2074
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "невідомі правила TOFU «%s»\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr "(команда «help» виводить список можливих варіантів)\n"
- #: g10/gpg.c:2105 g10/keygen.c:168
- #, c-format
- msgid "invalid value for option '%s'\n"
- msgstr "некоректне значення параметра «%s»\n"
-
- #: g10/gpg.c:2244
++#: g10/gpg.c:2227
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "«%s» не є коректною адресою електронної пошти\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "некоректний режим pinentry, «%s»\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» не є коректним набором символів\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "не вдалося обробити адресу сервера ключів\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: некоректні параметри імпортування\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "некоректні параметри імпортування\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, c-format
msgid "invalid filter option: %s\n"
msgstr "некоректний параметр фільтрування: %s\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: некоректні параметри експортування\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "некоректні параметри експортування\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: некоректні параметри побудови списку\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "некоректні параметри побудови списку\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "показувати фотоідентифікатори під час перевірки підписів"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "показувати адреси правил під час перевірки підписів"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "показувати всі примітки під час перевірки підписів"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "показувати стандартні примітки IETF під час перевірки підписів"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "показувати вказані користувачем примітки під час перевірки підписів"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"показувати адреси основних серверів ключів у списках перевірки підписів"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr ""
"показувати чинність ідентифікаторів користувача під час перевірки підписів"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"перевірки підписів"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr ""
"показувати лише основний ідентифікатор користувача під час перевірки підписів"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "перевірити підписи за допомогою даних PKA"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "підняти рівень довіри до підписів з коректними даними PKA"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: некоректні параметри перевірки\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "некоректні параметри перевірки\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не вдалося встановити шлях для запуску у значення %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: некоректний список auto-key-locate\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не можна використовувати разом з %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "УВАГА: запущено з фіктивним системним часом: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "вибраний алгоритм стискання є некоректним\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "значення completes-needed має бути більшим за 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "значення marginals-needed має перевищувати 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
- #: g10/gpg.c:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
"S2K (0)\n"
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
- #: g10/gpg.c:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "некоректні типові параметри\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "некоректні особисті параметри шифрування\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "некоректні особисті параметри контрольної суми\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "некоректні особисті параметри стискання\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
- #: 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:3863
- #, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+ #, fuzzy, c-format
+ #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr ""
"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
"%s\n"
- #: g10/gpg.c:3868
- #, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+ #, fuzzy, c-format
+ #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
"ключем\n"
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
"mode 0\n"
- #: g10/gpg.c:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
"s2k-mode 0\n"
- #: g10/gpg.c:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
"%s\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "помилка пошуку на сервері ключів: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "помилка оновлення з сервера ключів: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "помилка перетворення з формату ASCII: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "помилка перетворення у формат ASCII: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "некоректний алгоритм хешування «%s»\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "Почніть вводити ваше повідомлення...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "вказана адреса правил сертифікації є некоректною\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "вказана адреса правил підписування є некоректною\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "вказана адреса основного сервера ключів є некоректною\n"
@@@ -3104,7 -2407,6 +3108,7 @@@ msgstr "|FILE|визначити клю
msgid "make timestamp conflicts only a warning"
msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|записувати до дескриптора файла дані щодо стану"
@@@ -3133,137 -2430,113 +3137,143 @@@ msgstr "Довідки не перед�
msgid "No help available for '%s'"
msgstr "Довідки щодо %s не виявлено"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "імпортувати підписи, позначені як лише локальні"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "відновлювати пошкодження сервером ключів pks під час імпортування"
- #: g10/import.c:158
++#: g10/import.c:166
msgid "do not clear the ownertrust values during import"
msgstr "не вилучати значень власної довіри під час імпортування"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "не оновлювати базу даних довіри після імпортування"
- #: g10/import.c:164
++#: g10/import.c:172
msgid "show key during import"
msgstr "показувати ключ під час імпортування"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "приймати оновлення лише вже створених ключів"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "вилучити невикористані частини ключа після імпортування"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "вилучити максимум частин з ключа після імпортування"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr "запустити фільтри імпортування та експортувати ключ негайно"
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr "припускати формат резервних копій ключів GnuPG"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key during import"
+ msgid "repair keys on import"
+ msgstr "показувати ключ під час імпортування"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропускаємо блок типу %d\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "оброблено %lu ключів\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Загалом оброблено: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключів PGP-2: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "пропущено нових ключів: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без ід. користувача: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " імпортовано: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " без змін: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr "нових ід. користувачів: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " нових підключів: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " нових підписів: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr "відкликань нових ключів: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "прочитано закритих ключів: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "імпортовано закр. ключів: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " закр. ключів без змін: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не імпортовано: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " вилучених підписів: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " вилучених ід. корист.: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3272,190 -2545,152 +3282,190 @@@ msgstr "
"УВАГА: у ключі %s містяться записи надання переваги\n"
"недоступним алгоритмам для таких ід. користувачів:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " «%s»: перевага алгоритму шифрування %s\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " «%s»: перевага алгоритму контрольних сум %s\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " «%s»: перевага алгоритму стискання %s\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "наполегливо рекомендуємо вам оновити записи переваг і\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"оновити записи перевад можна за допомогою команди: gpg --edit-key %s updpref "
"save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: немає ідентифікатор користувача\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "відкинуто екранувальником імпорту"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: прийнято несамопідписаний ідентифікатор користувача «%s»\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: немає чинних ідентифікаторів користувача\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "причиною цього може бути те, що немає самопідпису\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новий ключ — пропущено\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "не виявлено придатного до запису сховища ключів: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не відповідає нашій копії\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: «%s» 1 новий підпис\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: «%s» %d нових підписів\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: «%s» 1 новий підключ\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: «%s» %d нових підключів\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підпис\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підписів\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: «%s» не змінено\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: імпортовано закритий ключ\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: закритий ключ вже існує\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "закритий ключ %s: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "імпортування закритих ключів заборонено\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
@@@ -3470,143 -2705,116 +3480,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
"Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
"%s\n"
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
"відкликання\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
"ідентифікатора користувача «%s»\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: немає підключа для зв’язування ключів\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: некоректне зв’язування підключів\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: немає підключа для відкликання ключа\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: некоректне відкликання підключа\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: вилучено кратне відкликання підключа\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущено підключ\n"
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: додано безпосередній підпис ключа\n"
@@@ -3646,86 -2847,12 +3656,15 @@@ msgstr "помилка під час с
msgid "failed to rebuild keyring cache: %s\n"
msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[відкликання]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[самопідпис]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, c-format
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr ""
- "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
- "відкритого ключа (%d): %s.\n"
-
- #: g10/keyedit.c:642
- #, c-format
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr ""
- "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
- "контрольної суми %d: %s.\n"
-
- #: g10/keyedit.c:805
- msgid " (reordered signatures follow)"
- msgstr " (нижче наведено перевпорядковані підписи)"
-
- #: g10/keyedit.c:918
- #, c-format
- msgid "key %s:\n"
- msgstr "ключ %s:\n"
-
- #: g10/keyedit.c:921
- #, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "вилучено %d дублікат підпису\n"
- msgstr[1] "вилучено %d дублікати підписів\n"
- msgstr[2] "вилучено %d дублікатів підписів\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 підпис не перевірено через те, що немає ключа\n"
- msgstr[1] "%d підписи не перевірено через те, що немає ключа\n"
- msgstr[2] "%d підписів не перевірено через те, що немає ключа\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[1] "%d помилкових підписи\n"
- msgstr[2] "%d помилкових підписів\n"
-
- #: g10/keyedit.c:932
- #, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "перевпорядковано %d підпис\n"
- msgstr[1] "перевпорядковано %d підписи\n"
- msgstr[2] "перевпорядковано %d підписів\n"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
- "Попередження: виявлено помилки, перевірка виконувалася лише для "
- "самопідписування, віддайте команду «%s», щоб перевірити усі підписи.\n"
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3736,17 -2863,14 +3675,17 @@@ msgstr "
"ключів інших\n"
"користувачів (за паспортами, відбитками з інших джерел тощо)\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Я довіряю не повністю\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Я довіряю повністю\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3756,52 -2880,40 +3695,52 @@@ msgstr "
"Глибина, більша за 1, дозволяє ключу, який ви підписуєте, створювати\n"
"надійні підписи від вашого імені.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
"такого домену немає.\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "Пропускаємо ідентифікатор користувача «%s», який не є текстовим.\n"
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Ідентифікатор користувача «%s» відкликано."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ви певні, що все ще бажаєте підписати його? (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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " Неможливо підписати.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Строк дії ідентифікатор користувача «%s» сплив."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Ідентифікатор користувача «%s» не є самопідписаним."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Ідентифікатор користувача «%s» можна підписувати. "
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "Підписати його? (y/N або т/Н) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3810,12 -2922,10 +3749,12 @@@ msgstr "
"Самопідпис «%s»\n"
"є підписом у форматі PGP 2.x.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до самопідпису OpenPGP? (y/N або т/Н) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3824,11 -2934,9 +3763,11 @@@ msgstr "
"Строк дії вашого поточного підпису «%s»\n"
"завершено.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Бажаєте видати новий підпис для заміни застарілого? (y/N або т/Н) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3837,45 -2945,36 +3776,45 @@@ msgstr "
"Ваш поточний підпис «%s»\n"
"є локальним підписом.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до повністю експортованого підпису? (y/"
"N або т/Н) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "«%s» вже було локально підписано ключем %s\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "«%s» вже було підписано ключем %s\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Бажаєте підписати його попри все? (y/N або т/Н) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нічого підписувати ключем %s\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "Строк дії цього ключа вичерпано!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Строк дії цього ключа завершиться %s.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Бажаєте, щоб строк дії вашого підпису був таким самим? (Y/n або Т/н) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3886,261 -2985,201 +3825,261 @@@ msgstr "
"справді належить особі, ім’я якої вказано вище? Якщо ви не знаєте відповіді, "
"введіть «0».\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду відповідати.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Мною не виконувалося ніяких перевірок.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Мною виконано часткову перевірку.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Мною виконано ретельну перевірку.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш вибір? (введіть «?», щоб дізнатися більше): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr "Ви справді бажаєте підписати цей ключ вашим ключем «%s» (%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "Це буде самопідпис.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "Підпис буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "Підпис буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "Цей ключ не перевірявся мною.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "Цей ключ перевірено мною частково.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "Цей ключ ретельно перевірено мною.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "Підписати? (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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "помилка під час спроби підписування: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"До ключа включено лише типовий заповнювач або записи ключа з картки — ніяких "
"паролів не потрібно змінювати.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "зберегти і вийти"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "показати відбиток ключа"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
msgid "show the keygrip"
msgstr "показати keygrip"
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "показати список ключів та ідентифікаторів користувача"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "вибрати вказаний ідентифікатор користувача"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "вибрати вказаний підключ"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "перевірити підписи"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"підписати вибрані ідентифікатори користувачів [* нижче наведено відповідні "
"команди]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "підписати вибрані ідентифікатори користувача локально"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "підписати вибрані ідентифікатори користувача підписом надійності"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"підписати вибрані ідентифікатори користувача підписом, який не можна "
"відкликати"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "додати ідентифікатор користувача"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "додати фотоідентифікатор"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "вилучити вибрані ідентифікатори користувача"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "додати підключ"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "додати ключ на картку пам’яті"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "пересунути ключ на картку пам’яті"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "пересунути резервний ключ на картку пам’яті"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "вилучити вибрані підключі"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "додати ключ відкликання"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "вилучити підписи з вибраних ідентифікаторів користувача"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "змінити дату завершення строку дії ключа або вибраних ключів"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "позначити вибраний ідентифікатор користувача як основний"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "список переваг (експертний)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "список переваг (докладний)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "встановити список параметрів для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"встановити адресу основного сервера ключів для вибраних ідентифікаторів "
"користувачів"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "встановити примітку для вибраного ідентифікатора користувача"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "змінити пароль"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "змінити рівень довіри до власника"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "відкликати підписи для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "відкликати вибрані ідентифікатори користувачів"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "відкликати ключ або вибрані підключі"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "увімкнути ключ"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "вимкнути ключ"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "показати вибрані фотоідентифікатори"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"невикористані підписи з ключа"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"всі підписи з ключа"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "Доступний закритий ключ.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "Для цього потрібен закритий ключ.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4151,276 -3190,224 +4090,288 @@@ msgstr "
" «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
" (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "Ключ відкликано."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
msgid "Really sign all text user IDs? (y/N) "
msgstr "Підписати всі текстові ідентифікатори користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Невідомий тип підпису «%s»\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Цією командою не можна користуватися у режимі %s.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "Вам слід вибрати принаймні один ідентифікатор користувача.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Скористайтеся командою «%s».)\n"
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Вилучити всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "Вилучити цей ідентифікатор користувача? (y/N або т/Н) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "Вилучити основний ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "Вам слід вибрати лише один ключ.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "Для команди слід вказати аргумент з назвою файла\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не вдалося відкрити «%s»: %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Помилка читання резервного ключа з «%s»: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "Вам слід вибрати принаймні один ключ.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Відкликати всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "Відкликати цей ідентифікатор користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Ви справді бажаєте відкликати весь ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Ви справді бажаєте відкликати цей підключ? (y/N або т/Н) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Не можна встановлювати довіру до власника, якщо використовується вказана "
"користувачем база даних довіри\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "Встановити список переваг:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Оновити переваги для вибраних ідентифікаторів користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "Оновити параметри? (y/N або т/Н) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "Зберегти зміни? (y/N або т/Н) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "Вийти без збереження? (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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "помилка оновлення: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "помилка перевірки списку довіри: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "помилка перевірки списку довіри: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "«%s» не є відбитком\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "«%s» не є основним відбитком\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "Некоректний ідентифікатор користувача «%s»: %s\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "Немає відповідних ідентифікаторів користувачів."
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "Нічого підписувати.\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, c-format
msgid "'%s' is not a valid expiration time\n"
msgstr "«%s» не є коректним записом завершення строку дії\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "\"%s\" is not a fingerprint\n"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "«%s» не є відбитком\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "ключ «%s» не знайдено\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "Контрольна сума: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "Можливості: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "Сервер ключів без можливості зміни"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "Основний сервер ключів: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "Примітки: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Цей ключ може бути відкликано %s ключем %s"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(важливий)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "створено: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "відкликано: %s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "не діє з: %s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "діє до: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "використання: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "номер картки: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "надійність: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "чинність: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "Цей ключ було вимкнено"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4428,18 -3415,12 +4379,18 @@@ msgstr "
"Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
"до перезапуску програми.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "збіг строк дії"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
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"
@@@ -4449,15 -3430,12 +4400,15 @@@ msgstr "
" цієї команди можна зробити основним інший ідентифікатор "
"користувача.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4467,35 -3445,27 +4418,35 @@@ msgstr "
"до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
@@@ -4503,20 -3473,16 +4454,20 @@@ msgstr[0] "Вилучено %d підп
msgstr[1] "Вилучено %d підписи.\n"
msgstr[2] "Вилучено %d підписів.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "Нічого не вилучено.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "некоректний"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4524,17 -3490,14 +4475,17 @@@ msgstr[0] "Ідентифікатор �
msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4544,39 -3507,31 +4495,39 @@@ msgstr "
"призвести до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "не можна призначати ключ власним підписаним відкликанням\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "цей ключ вже було позначено як призначений для відкликання\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
"Н) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
@@@ -4584,175 -3539,142 +4535,180 @@@ msgstr "
"Ви справді хочете змінити час вичерпання строку дії для декількох підключів? "
"(y/N або т/Н) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "Зміна часу завершення строку дії для підключа.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "Зміна часу завершення строку дії для основного ключа.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "підписування підключа %s вже перехресно сертифіковано\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"підключ %s не призначено для підписування, отже його не потрібно перехресно "
"сертифікувати\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "Вкажіть адресу вашого основного сервера ключів: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "Вкажіть примітку: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "Продовжувати? (y/N або т/Н) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ідентифікатора користувача з індексом %d не існує\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ідентифікатора користувача з хешем %s не існує\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Піключа із ідентифікатором ключа «%s» не існує.\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "Підключа з індексом %d не існує\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Ідентифікатор користувача: «%s»\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "підписано вашим ключем %s %s%s%s\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (неекспортовний)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Строк дії цього підпису завершується %s.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "Не підписано вами.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (невідкликуваний)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "відкликано вашим ключем %s у %s\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "Ви маєте намір відкликати ці підписи:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "немає закритого ключа\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr "спроба відкликати ідентифікатор, який не належить користувачеві: %s\n"
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ідентифікатор користувача «%s» вже відкликано\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
"майбутньому\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s вже відкликано.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Підключ %s вже відкликано.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
++#: g10/keygen.c:168
+ #, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "некоректне значення параметра «%s»\n"
+
+#: g10/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "запис переваги «%s» продубльовано\n"
@@@ -5188,8 -4033,6 +5144,8 @@@ msgstr "
"під час створення простого числа. Це надасть змогу генератору\n"
"псевдовипадкових чисел створити краще випадкове число.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Помилка під час спроби створення ключа: %s\n"
@@@ -5262,7 -4092,6 +5218,7 @@@ msgstr "помилка під час с
msgid "public and secret key created and signed.\n"
msgstr "відкритий і закритий ключі створено і підписано.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5270,7 -4099,6 +5226,7 @@@ msgstr "
"Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
"скористатися командою «--edit-key» для створення підключа з цією метою.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5278,7 -4106,6 +5234,7 @@@ msgstr "
"ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
"проблема з годинником)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5286,47 -4113,36 +5242,47 @@@ msgstr "
"ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "Закриті частини основного ключа недоступні.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Закриті частини основного ключа зберігаються на картці.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "Створити? (y/N або т/Н) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "ніколи "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Критичні правила підпису: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Правила підпису: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "Критичний основний сервер ключів: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "Критична примітка підпису: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "Примітка підпису: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
@@@ -5334,7 -4150,20 +5290,23 @@@ msgstr[0] "%d добрий підпис
msgstr[1] "%d добрих підписи\n"
msgstr[2] "%d добрих підписів\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, c-format
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d помилкових підпис\n"
+ msgstr[1] "%d помилкових підписи\n"
+ msgstr[2] "%d помилкових підписів\n"
+
++#: g10/keylist.c:482
+ #, c-format
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "%d підпис не перевірено через те, що немає ключа\n"
+ msgstr[1] "%d підписи не перевірено через те, що немає ключа\n"
+ msgstr[2] "%d підписів не перевірено через те, що немає ключа\n"
+
++#: g10/keylist.c:487
#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
@@@ -5342,7 -4171,6 +5314,7 @@@ msgstr[0] "%d підпис не пер�
msgstr[1] "%d підписи не перевірено через помилку\n"
msgstr[2] "%d підписів не перевірено через помилку\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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"
@@@ -5352,33 -4180,26 +5324,33 @@@ msgstr[1] "
msgstr[2] ""
"Попередження: %lu ключів пропущено через їхній надто великий розмір\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "Сховище ключів"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "Основний відбиток ключа:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " Відбиток підключа:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr "Відбиток основного ключа:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " Відбиток підключа:"
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " Відбиток ключа ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr "Серійний номер картки ="
@@@ -5490,258 -4290,209 +5462,264 @@@ msgid "no keyserver known (use option -
msgstr ""
"не вказано жодного сервера ключів (скористайтеся параметром --keyserver)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "надсилаємо запит щодо ключа %s до %s сервера %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "надсилаємо запит щодо ключа %s з %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
msgid "no keyserver known\n"
msgstr "немає відомих серверів ключів\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено «%s»: %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "надсилаємо ключ %s на %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "надсилаємо запит щодо ключа з «%s»\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "УВАГА: не вдалося отримати адресу %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "дивний розмір для зашифрованого ключа сеансу (%d)\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "зашифрований %s ключ сеансу\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr ""
"пароль створено за допомогою невідомого алгоритму створення контрольних сум "
"%d\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "відкритий ключ — %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "зашифровані відкритим ключем дані: належний DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, створено "
"%s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " «%s»\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "зашифровано ключем %s, ідентифікатор %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "невдала спроба розшифровування відкритим ключем: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "зашифровано за допомогою %lu паролів\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "зашифровано за допомогою 1 пароля\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "припускаємо, що дані зашифровано %s\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Шифр IDEA недоступний, спробуємо скористатися замість нього %s\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "УВАГА: цілісність повідомлення не захищено\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "розшифровано\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "УВАГА: зашифроване повідомлення було змінено!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "невдала спроба розшифрування: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "ЗАУВАЖЕННЯ: вимога відправника: «лише для Вас»\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "початкова назва файла=«%.*s»\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "УВАГА: виявлено декілька фрагментів нешифрованого тексту\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "підпису не знайдено\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПОМИЛКОВИЙ підпис від «%s»"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Прострочений підпис від «%s»"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "Належний підпис від «%s»"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "перевірку підписів придушено\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "Підпис створено %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " за допомогою %s ключа %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, c-format
msgid " issuer \"%s\"\n"
msgstr " видавець «%s»\n"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Ключ доступний на: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[непевний]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " або «%s»"
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Строк дії підпису вичерпано %s\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "Підпис діє до %s\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "двійковий"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "текстовий"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "невідомо"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не вдалося перевірити підпис: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "не є від’єднаним підписом\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "окремий підпис класу 0x%02x\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "підпис у застарілому форматі (PGP 2.x)\n"
@@@ -5803,68 -4543,55 +5781,68 @@@ msgstr "(повідомлена пом�
msgid "(further info: "
msgstr "(подальша інформація: "
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: застарілий параметр «%s»\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "УВАГА: «%s» вважається застарілим параметром\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "будь ласка, скористайтеся «%s%s»\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "УВАГА: «%s» вважається застарілою командою — не користуйтеся нею\n"
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "Нестиснений"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "uncompressed|немає"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначний параметр «%s»\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "невідомий параметр «%s»\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "невідома слабка контрольна сума «%s»\n"
@@@ -6364,35 -4992,33 +6342,41 @@@ msgstr "не вдалося відкр�
msgid "can't open signed data fd=%d: %s\n"
msgstr "не вдалося відкрити підписані дані fd=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "сертифікат непридатний для шифрування\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "анонімний отримувач; спробуємо закритий ключ %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "добре, ми є анонімним отримувачем.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "застаріле кодування DEK не підтримується\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "алгоритм шифрування %d%s є невідомим або вимкненим\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "УВАГА: не виявлено алгоритму шифрування %s у перевагах отримувача\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "ЗАУВАЖЕННЯ: строк дії закритого ключа %s завершився %s\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "ЗАУВАЖЕННЯ: ключ було відкликано"
@@@ -6560,7 -5158,6 +6544,7 @@@ msgstr "(Опису не надано)\
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N або т/Н) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "створено слабкий ключ — повторюємо спробу\n"
@@@ -6583,27 -5177,27 +6567,33 @@@ msgstr "
"Для використання %s ключа %s потрібен хеш з %zu або більше бітів (маємо хеш "
"%s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "УВАГА: конфлікт контрольних сум підписів у повідомленні\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "не можна використовувати %s у режимі %s\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "УВАГА: підписування підключа %s не є перехресно сертифікованим\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "будь ласка, ознайомтеся з %s, щоб дізнатися більше\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"УВАГА: підписування підключа %s містить некоректну перехресну сертифікацію\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, 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"
@@@ -6611,7 -5205,6 +6601,7 @@@ msgstr[0] "відкритий ключ
msgstr[1] "відкритий ключ %s є на %lu секунди новішим за підпис\n"
msgstr[2] "відкритий ключ %s є на %lu секунд новішим за підпис\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, 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"
@@@ -6619,7 -5212,6 +6609,7 @@@ msgstr[0] "відкритий ключ
msgstr[1] "відкритий ключ %s є на %lu дні новішим за підпис\n"
msgstr[2] "відкритий ключ %s є на %lu днів новішим за підпис\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6635,7 -5227,6 +6625,7 @@@ msgstr[2] "
"ключ %s було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6650,40 -5241,33 +6640,40 @@@ msgstr[2] "
"ключ %s було створено з позначкою на %lu днів у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "ЗАУВАЖЕННЯ: строк дії ключа підпису %s завершився %s\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відкликано\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"припускаємо помилковий підпису від ключа %s через невідомий критичний біт\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "ключ %s: немає підключа для підпису відкликання підключа\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "ключ %s: немає підключа для підпису прив’язування підключа\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"УВАГА: не вдалося виконати %%-розгортання примітки (занадто велика). "
"Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6691,7 -5275,6 +6681,7 @@@ msgstr "
"УВАГА: не вдалося виконати %%-розгортання адреси правил (занадто велика). "
"Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6700,12 -5283,10 +6690,12 @@@ msgstr "
"УВАГА: не вдалося виконати %%-розгортання адреси основного сервера ключів "
"(занадто велика). Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s підпис від: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6713,31 -5294,25 +6703,31 @@@ msgstr "
"УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
"відповідає параметрам отримувача\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "підписування:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "Буде використано шифрування %s\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не було позначено як ненадійний — не можна використовувати його з "
"фіктивним RNG!\n"
- #: g10/skclist.c:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено «%s»: дублювання\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "пропущено: закритий ключ вже існує\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"це ключ Elgamal створений за допомогою PGP, цей ключ недостатньо безпечний "
@@@ -6822,7 -5381,6 +6812,7 @@@ msgstr "занадто велика о�
msgid "%s: directory does not exist!\n"
msgstr "%s: каталогу не існує!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "немає доступу до «%s»: %s\n"
@@@ -6932,82 -5468,64 +6922,82 @@@ msgstr "
msgid "input line longer than %d characters\n"
msgstr "рядок вхідних даних довший за %d символів\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr ""
"помилка під час спроби розпочати внесення змін до бази даних TOFU: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "помилка під час внесення змін до бази даних TOFU: %s\n"
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "помилка під час скасовування змін у базі даних TOFU: %s\n"
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "непідтримувана версія бази даних TOFU: %s\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr ""
"помилка під час спроби створити таблицю TOFU «ultimately_trusted_keys»: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr "помилка бази даних TOFU"
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "помилка під час спроби визначення версії бази даних TOFU: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "помилка під час спроби ініціалізації бази даних TOFU: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "помилка під час спроби створити таблицю TOFU «encryptions»: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr "додаємо стовпчик effective_policy до бази даних прив’язок: %s\n"
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU «%s»: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr "Адреса електронної пошти «%s» вперше використовується з ключем %s."
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, c-format
msgid "The email address \"%s\" is associated with %d key!"
msgid_plural "The email address \"%s\" is associated with %d keys!"
@@@ -7015,13 -5533,11 +7005,13 @@@ msgstr[0] "Адресу електро�
msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключами!"
msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключами!"
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
" Оскільки правилами цієї прив’язки визначалося «автоматично», їх змінено на "
"«запитувати»."
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
@@@ -7030,27 -5546,22 +7020,27 @@@ msgstr "
"Будь ласка, вкажіть, слід пов’язати цю адресу електронної пошти з ключем %s "
"чи ви вважаєте, що хтось видає себе за «%s»."
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
- #: g10/tofu.c:1619
++#: g10/tofu.c:1618
msgid "This key's user IDs:\n"
msgstr "Ідентифікатори користувачів цього ключа:\n"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, c-format
msgid "policy: %s"
msgstr "правило: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr ""
"помилка під час спроби зібрати статистичні дані щодо підписування: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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"
@@@ -7058,16 -5569,13 +7048,16 @@@ msgstr[0] "Адресу електро�
msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
- #: g10/tofu.c:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
msgid "this key"
msgstr "цей ключ"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
@@@ -7075,7 -5583,6 +7065,7 @@@ msgstr[0] "Перевірено %d по
msgstr[1] "Перевірено %d повідомлення."
msgstr[2] "Перевірено %d повідомлень."
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
@@@ -7083,7 -5590,6 +7073,7 @@@ msgstr[0] "Зашифровано %d п
msgstr[1] "Зашифровано %d повідомлення."
msgstr[2] "Зашифровано %d повідомлень."
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
@@@ -7091,7 -5597,6 +7081,7 @@@ msgstr[0] "Перевірено %d по
msgstr[1] "Перевірено %d повідомлення у майбутньому."
msgstr[2] "Перевірено %d повідомлень у майбутньому."
- #: g10/tofu.c:1839
++#: g10/tofu.c:1838
#, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
@@@ -7099,7 -5604,6 +7089,7 @@@ msgstr[0] "Зашифровано %d п
msgstr[1] "Зашифровано %d повідомлення у майбутньому."
msgstr[2] "Зашифровано %d повідомлень у майбутньому."
- #: g10/tofu.c:1853
++#: g10/tofu.c:1852
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7107,7 -5611,6 +7097,7 @@@ msgstr[0] "Перевірено пов�
msgstr[1] "Перевірено повідомлень протягом останніх %d днів: %d."
msgstr[2] "Перевірено повідомлень протягом останніх %d днів: %d."
- #: g10/tofu.c:1859
++#: g10/tofu.c:1858
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7115,7 -5618,6 +7105,7 @@@ msgstr[0] "Повідомлень, як
msgstr[1] "Повідомлень, які зашифровано протягом останніх %d днів: %d."
msgstr[2] "Повідомлень, які зашифровано протягом останніх %d днів: %d."
- #: g10/tofu.c:1869
++#: g10/tofu.c:1868
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7123,7 -5625,6 +7113,7 @@@ msgstr[0] "Перевірено пов�
msgstr[1] "Перевірено повідомлень протягом останніх %d місяців: %d."
msgstr[2] "Перевірено повідомлень протягом останніх %d місяців: %d."
- #: g10/tofu.c:1875
++#: g10/tofu.c:1874
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7131,7 -5632,6 +7121,7 @@@ msgstr[0] "Повідомлень, як
msgstr[1] "Повідомлень, які зашифровано протягом останніх %d місяців: %d."
msgstr[2] "Повідомлень, які зашифровано протягом останніх %d місяців: %d."
- #: g10/tofu.c:1885
++#: g10/tofu.c:1884
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7139,7 -5639,6 +7129,7 @@@ msgstr[0] "Перевірено пов�
msgstr[1] "Перевірено повідомлень протягом останніх %d років: %d."
msgstr[2] "Перевірено повідомлень протягом останніх %d років: %d."
- #: g10/tofu.c:1891
++#: g10/tofu.c:1890
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7147,12 -5646,10 +7137,12 @@@ msgstr[0] "Повідомлень, як
msgstr[1] "Повідомлень, які зашифровано протягом останніх %d років: %d."
msgstr[2] "Повідомлень, які зашифровано протягом останніх %d років: %d."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr "Повідомлень, які перевірено у минулому: %d."
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, c-format
msgid "Messages encrypted in the past: %d."
msgstr "Повідомлень, які зашифровано у минулому: %d."
@@@ -7160,7 -5657,6 +7150,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:1920
++#: g10/tofu.c:1919
msgid "TOFU detected a binding conflict"
msgstr ""
"Зазвичай, з певною адресою електронної пошти пов’язано лише один ключ. Втім, "
@@@ -7173,42 -5669,34 +7163,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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
"(G)Добрий, (A)Прийняти одноразово, (U)Невідомий, (R)Відкинути одноразово, "
"(B)Поганий? "
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
#, fuzzy
#| msgid "Defaulting to unknown."
msgid "Defaulting to unknown.\n"
msgstr "Типовим значенням є «невідомий»."
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr "Виявлено пошкодження бази даних TOFU.\n"
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, c-format
msgid "resetting keydb: %s\n"
msgstr "скидаємо базу даних ключів: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "помилка під час спроби встановлення правил прив’язки TOFU до %s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "помилка під час спроби змінити правила TOFU: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7216,7 -5704,6 +7206,7 @@@ msgstr[0] "%lld~рік
msgstr[1] "%lld~роки"
msgstr[2] "%lld~років"
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7224,7 -5711,6 +7214,7 @@@ msgstr[0] "%lld~місяць
msgstr[1] "%lld~місяці"
msgstr[2] "%lld~місяців"
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7232,7 -5718,6 +7222,7 @@@ msgstr[0] "%lld~тиждень
msgstr[1] "%lld~тижні"
msgstr[2] "%lld~тижнів"
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7240,7 -5725,6 +7230,7 @@@ msgstr[0] "%lld~день
msgstr[1] "%lld~дні"
msgstr[2] "%lld~днів"
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7248,7 -5732,6 +7238,7 @@@ msgstr[0] "%lld~година
msgstr[1] "%lld~години"
msgstr[2] "%lld~годин"
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7256,7 -5739,6 +7246,7 @@@ msgstr[0] "%lld~хвилина
msgstr[1] "%lld~хвилини"
msgstr[2] "%lld~хвилин"
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7264,17 -5746,14 +7254,17 @@@ msgstr[0] "%lld~секунда
msgstr[1] "%lld~секунди"
msgstr[2] "%lld~секунд"
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr "%s: перевірено 0~підписів і зашифровано 0~повідомлень."
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, c-format
msgid "%s: Verified 0 signatures."
msgstr "%s: перевірено 0 підписів."
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, c-format
msgid "%s: Verified %ld~signature in the past %s."
msgid_plural "%s: Verified %ld~signatures in the past %s."
@@@ -7282,11 -5761,9 +7272,11 @@@ msgstr[0] "%s: перевірено %ld
msgstr[1] "%s: перевірено %ld~підписи протягом останнього %s."
msgstr[2] "%s: перевірено %ld~підписів протягом останнього %s."
- #: g10/tofu.c:3168
++#: g10/tofu.c:3166
msgid "Encrypted 0 messages."
msgstr "Зашифровано 0 повідомлень."
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, c-format
msgid "Encrypted %ld~message in the past %s."
msgid_plural "Encrypted %ld~messages in the past %s."
@@@ -7294,34 -5771,28 +7284,34 @@@ msgstr[0] "Зашифровано %ld~�
msgstr[1] "Зашифровано %ld~повідомлення протягом останнього %s."
msgstr[2] "Зашифровано %ld~повідомлень протягом останнього %s."
- #: g10/tofu.c:3187
++#: g10/tofu.c:3185
#, c-format
msgid "(policy: %s)"
msgstr "(правило: %s)"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
"Попередження: ще не існує повідомлень, які було б підписано цим ключем та "
"ідентифікатором користувача!\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
"Попередження: за допомогою цього ключа і ідентифікатора користувача "
"підписано лише одне повідомлення!\n"
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr "Попередження: цим ключем ще не зашифровано жодного повідомлення!\n"
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr "Попередження: цим ключем було зашифровано лише одне повідомлення!\n"
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7357,13 -5828,10 +7347,13 @@@ msgstr[2] "
" %s\n"
"для позначення ключа як помилкового.\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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, 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"
@@@ -7371,7 -5839,6 +7361,7 @@@ msgstr "
"ПОПЕРЕДЖЕННЯ: шифруємо до %s, для якого не виявлено не відкликаних "
"ідентифікаторів користувача.\n"
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr ""
@@@ -7608,23 -6030,18 +7598,23 @@@ msgstr "
"Синтаксис: kbxutil [параметри] [файли]\n"
"Перегляд, експортування, імпортування даних Keybox\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
"Не знайдено основи числення RSA або основа числення не належить до %d-"
"бітових\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
"Не вистачає відкритого показника RSA або розмірність показника перевищує %d "
"бітів\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "Зворотний виклик пінкоду повернув повідомлення про помилку: %s\n"
@@@ -7681,42 -6089,33 +7671,42 @@@ msgstr "
"|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для створення якісних "
"підписів."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "помилка під час отримання нового пінкоду: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "не вдалося зберегти відбиток: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "не вдалося зберегти дату створення: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "помилка отримання стану CHV з картки\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "відповідь не містить основи числення RSA\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "відповідь не містить відкритого показника RSA\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
msgid "response does not contain the EC public key\n"
msgstr "відповідь не містить відкритого ключа еліптичної кривої\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "відповідь не містить даних відкритого ключа\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "помилка читання відкритого ключа: %s\n"
@@@ -7724,57 -6123,46 +7714,57 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "використовуємо типовий пінкод як %s\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"не вдалося використати типовий пінкод як %s: %s — вимикаємо подальше типове "
"використання\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||Вкажіть пінкод"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "Пінкод для CHV%d занадто короткий; мінімальна довжина — %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "помилка перевірки CHV%d: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "картку заблоковано!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
@@@ -7791,23 -6179,18 +7781,23 @@@ msgstr[2] "
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Вкажіть адміністративний пінкод"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "доступ до адміністративних команд не налаштовано\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Вкажіть пінкод"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||Вкажіть код скидання коду картки"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Занадто короткий код скидання; мінімальна довжина — %d\n"
@@@ -7815,78 -6198,60 +7805,78 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|Новий код скидання"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|Новий адміністративний пінкод"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|Новий пінкод"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||Вкажіть адміністративний пінкод та новий адміністративний пінкод"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||Вкажіть пінкод та новий пінкод"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "помилка читання даних програми\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "помилка читання відбитка DO\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "ключ вже існує\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "вже створений ключ буде замінено\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "створення нового ключа\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "записування нового ключа\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "не вказано часової позначки створення\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
"Не знайдено простого числа RSA %s або число не належить до %d-бітових\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "не вдалося зберегти ключ: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
msgid "unsupported curve\n"
msgstr "непідтримувана крива\n"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "зачекайте на завершення створення ключа...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "помилка під час створення ключа\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
@@@ -7894,30 -6259,24 +7884,30 @@@ msgstr[0] "створення ключ�
msgstr[1] "створення ключа завершено (за %d секунди)\n"
msgstr[2] "створення ключа завершено (за %d секунд)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "некоректна структура картки OpenPGP (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "відбиток на картці не відповідає запитаному\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "вже створено підписів: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "перевірку адміністративного пінкоду заборонено цією командою\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
@@@ -7937,11 -6293,9 +7927,11 @@@ msgstr "|N|Початковий нов�
msgid "run in multi server mode (foreground)"
msgstr "запустити у режимі декількох серверів (основному режимі)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|встановити вказаний рівень діагностики"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|FILE|записувати журнал до файла"
@@@ -7995,12 -6338,10 +7985,12 @@@ msgstr "
"будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
"фоновому режимі\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "запущено запуск обробки для дескриптора %d\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "роботу обробника для дескриптора %d перервано\n"
@@@ -8071,9 -6397,6 +8061,9 @@@ msgstr "кількість відпов
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "помилка пошуку ключів лише з dirmngr: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "не вдалося розмістити дескриптор keyDB\n"
@@@ -8247,7 -6530,6 +8237,7 @@@ msgstr "використана моде
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "%u-бітовий хеш не є коректним для %u-бітового ключа %s\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(це алгоритм MD2)\n"
@@@ -8290,7 -6565,6 +8280,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "не вказано використання ключа — припускаємо всі можливі використання\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "помилка під час спроби отримання даних щодо використання ключа: %s\n"
@@@ -8551,11 -6772,9 +8541,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr "проблема з ресурсами: вихід за межі пам’яті\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(це алгоритм RC2)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(здається, це не зашифроване повідомлення)\n"
@@@ -8584,130 -6798,99 +8574,130 @@@ msgstr "сертифікат «%s» в�
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "помилка під час спроби вилучення сертифіката «%s»: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "не вказано коректних отримувачів\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "показати ключ зовнішніх ключів"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "показати ланцюжок сертифікації"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "імпортувати сертифікати"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "експортувати сертифікати"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "зареєструвати картку пам’яті"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "передати команду dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "виклик gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "створити дані, закодовані у BASE64"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "вважати вхідні дані даними у форматі PEM"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "вважати вхідні дані даними у форматі BASE64"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "вважати вхідні дані даними у двійковому форматі"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "не використовувати САС"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "перевіряти чинність за допомогою OCSP"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "кількість сертифікатів, які слід включити"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|взяти дані щодо правил з вказаного файла"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "не перевіряти правила сертифікатів"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "Надіслати запит щодо незнайдених сертифікатів видавця"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "взагалі не використовувати термінал"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|записувати журнал режиму сервера до файла"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|записувати журнал перевірки до файла"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "пакетний режим: нічого не запитувати"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "вважати відповіддю на більшість питань «так»"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "вважати відповіддю на більшість питань «ні»"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|додати сховище ключів до списку сховищ ключів"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
"|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "використовувати цей сервер ключів для пошуку"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|використовувати вказаний алгоритм шифрування"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr ""
"|NAME|використовувати вказаний алгоритм обчислення контрольної суми "
"повідомлення"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Використання: @GPGSM@ [параметри] [файли] (-h — довідка)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8718,46 -6901,37 +8708,46 @@@ msgstr "
"протоколу S/MIME\n"
"Типова дія залежатиме від вхідних даних\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "ЗАУВАЖЕННЯ: не вдасться зашифрувати до «%s»: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "невідома модель перевірки «%s»\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: не вказано назви вузла\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: вказано пароль, але не вказано користувача\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: пропускаємо цей рядок\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "не вдалося обробити сервер ключів\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "імпортуємо загальні сертифікати «%s»\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "підписування за допомогою «%s» неможливе: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "некоректна команда (немає неявної команди)\n"
@@@ -8818,7 -6980,6 +8808,7 @@@ msgstr "проблема з повто�
msgid "error storing flags: %s\n"
msgstr "помилка під час спроби збереження позначок: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "Помилка - "
@@@ -8853,7 -7010,6 +8843,7 @@@ msgstr "
"\n"
"%s%sВи справді хочете це зробити?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8872,52 -7027,42 +8862,52 @@@ msgstr "
"«%s»\n"
"Зауважте, що цей сертифікат НЕ створюватиме якісного підпису!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
"підтримки алгоритму хешування %d (%s) для підписувальника %d не передбачено; "
"використовуємо %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "алгоритм хешування, використаний для підписувача %d: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "помилка перевірки якості сертифікатів: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "Підпис створено "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[дату не вказано]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " використовуємо ідентифікатор сертифіката 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
"некоректний підпис: атрибут контрольної суми повідомлення не збігається з "
"обчисленою сумою\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "Правильний підпис від"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " або"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "Це якісний підпис\n"
@@@ -9702,112 -7686,84 +9692,112 @@@ msgstr "мало бути вказан�
msgid "looking up '%s'\n"
msgstr "пошук «%s»\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "показати вміст кешу CRL"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|отримати CRL з вказаної адреси"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "завершити роботу dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "спорожнити кеш"
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|записувати журнал режиму сервера до файла"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "запустити без запиту до користувача"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "примусове завантаження застарілих САС"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "дозволити надсилання запитів OCSP"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr "дозволити інтерактивну перевірку версії програмного забезпечення"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "заборонити використання HTTP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "заборонити використання LDAP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу HTTP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу LDAP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "ігнорувати адреси служб OCSP з сертифікатами"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не використовувати резервні вузли з --ldap-proxy"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|встановити вказаний час очікування даних від LDAP"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|відповідь OCSP підписано FPR"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|повертати не більше за вказану кількість записів на запит"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9817,11 -7773,9 +9807,11 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man) «info»)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9829,78 -7783,61 +9819,78 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
"Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "коректними рівнями зневаджування є: %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "використання: %s [параметри]"
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "не можна використовувати двокрапки у назві сокета\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "помилка під час обробки CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: занадто довгий рядок — пропущено\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: виявлено некоректний відбиток\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: помилка під час читання: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
"отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "примусове завершення роботи\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "отримано сигнал %d — дій не визначено\n"
@@@ -10071,7 -7972,14 +10061,18 @@@ msgstr "«%s» не є адресою L
msgid "'%s' is an invalid LDAP URL\n"
msgstr "«%s» є некоректною адресою LDAP\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "помилка під час спроби доступу до «%s»: стан http %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "помилка під час спроби виводу рядка журналу: %s\n"
@@@ -10137,12 -8033,10 +10138,12 @@@ msgstr "додавання «%s:%d» д
msgid "malloc failed: %s\n"
msgstr "помилка malloc: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: некоректний шаблон «%s»\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search перевищив обмеження розміру сервера\n"
@@@ -10202,12 -8084,6 +10203,7 @@@ msgstr "помилка під час с
msgid "error reading HTTP response for '%s': %s\n"
msgstr "помилка під час спроби читання відповіді за HTTP для «%s»: %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "помилка під час спроби доступу до «%s»: стан http %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "помилка під час обробки відповіді за OCSP для «%s»: %s\n"
@@@ -10321,76 -8173,60 +10317,76 @@@ msgstr "Відповідачем OCSP �
msgid "OCSP responder returned an too old status\n"
msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "помилка assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "не вказано ldapserver"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "у ідентифікаторі сертифіката немає серійного номера"
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "помилка assuan_inquire: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "помилка fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "помилка start_cert_fetch: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "помилка fetch_next_cert: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "перевищено max_replies у %d\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "не вдалося розмістити структуру керування: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "не вдалося розмістити контекст assuan: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "не вдалося ініціалізувати сервер: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема з прийняттям Assuan: %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "помилка обробки за допомогою Assuan: %s\n"
@@@ -10522,185 -8329,138 +10518,185 @@@ msgstr "помилка надсилан
msgid "error sending standard options: %s\n"
msgstr "помилка під час спроби надсилання стандартних параметрів: %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "Параметри керування діагностичним виводом"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "Параметри керування налаштуваннями"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "Параметри діагностики"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "Параметри керування захистом"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|завершувати строк дії ключів SSH за N секунд"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|встановити максимальний строк дії кешу пінкодів у секундах"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|встановити максимальний строк дії ключа SSH у секундах"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "Параметри примусового використання правил паролів"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "не дозволяти обхід правил паролів"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|встановити вказану мінімальну довжину нових паролів"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|вимагати у нових паролях не менше вказаної кількості нелітер"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|перевіряти нові паролі за зразком з вказаного файла"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|завершувати строк дії паролів за вказану кількість днів"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "не дозволяти повторне використання старих паролів"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|встановити вказаний час очікування Pinentry у секундах"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|використовувати вказаний типовий закритий ключ"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|шифрувати також до вказаного ідентифікатора користувача"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|встановити замінники адреси електронної пошти"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "Налаштування для серверів ключів"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|використовувати сервер ключів за адресою"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "дозволити пошук PKA (запити до DNS)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
"|MECHANISMS|використовувати вказаний механізм для пошуку ключів за адресою"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "заборонити доступ до dirmngr"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "використовувати вказане кодування для паролів PKCS#12"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "не шукати у списках відкликаних сертифікатів кореневі сертифікати"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "Параметри керування форматом виведення"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "Параметри керування інтерактивністю та примусом"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr "Параметри керування використанням Tor"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "Налаштування для серверів HTTP"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "використовувати загальносистемний проксі-сервер HTTP"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "Налаштування використання серверів LDAP"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "список серверів LDAP"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "Налаштування OCSP"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr "Закриті ключі"
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr "Картки пам’яті"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr "Мережа"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
msgid "Passphrase Entry"
msgstr "Введення пароля"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "Компонент не є придатним до запуску"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "Помилка зовнішньої перевірки компонента %s"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "Зауважте, що специфікації груп буде проігноровано\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, c-format
msgid "error closing '%s'\n"
msgstr "помилка під час спроби закрити «%s»\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, c-format
msgid "error parsing '%s'\n"
msgstr "помилка під час спроби обробити «%s»'\n"
@@@ -10769,11 -8513,9 +10765,11 @@@ msgstr "використати фай�
msgid "activate changes at runtime, if possible"
msgstr "якщо можна, задіяти зміни у динамічному режимі"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Використання: @GPGCONF@ [параметри] (-h — довідка)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10781,15 -8523,12 +10777,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметри]\n"
"Керування параметрами налаштування інструментів системи @GNUPG@\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "Слід вказати один аргумент компонента"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "Компонент не знайдено"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "Не можна вказувати аргументів"
diff --cc po/zh_CN.po
index e70c3d9,acee43b..084ce93
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -20,7 -19,6 +20,7 @@@
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "无法存储指纹：%s\n"
@@@ -31,41 -29,32 +31,41 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr ""
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr ""
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
msgid "|pinentry-label|_Yes"
msgstr ""
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
msgid "|pinentry-label|_No"
msgstr ""
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr ""
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
msgid "|pinentry-label|_Save in password manager"
msgstr ""
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -73,7 -62,6 +73,7 @@@ msgstr "无效的密码
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
#, fuzzy
msgid "Quality:"
msgstr "有效性：%s"
@@@ -84,75 -72,59 +84,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
#, fuzzy
msgid "PIN too long"
msgstr "列太长"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
#, fuzzy
msgid "Passphrase too long"
msgstr "列太长"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "姓名含有无效的字符\n"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad PIN"
msgstr "损坏的多精度整数(MPI)"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
#, fuzzy
msgid "Bad Passphrase"
msgstr "错误的密码"
@@@ -162,158 -133,117 +162,158 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 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:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, 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: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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: agent/command-ssh.c:2473
++#: agent/command-ssh.c:2487
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/command-ssh.c:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/command-ssh.c:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密码"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, 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:3635
++#: agent/command-ssh.c:3660
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
#, fuzzy
msgid "Please insert the card with serial number"
msgstr ""
"请取出当前的卡，并插入有下列序列号的卡：\n"
" %.*s\n"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
"请取出当前的卡，并插入有下列序列号的卡：\n"
" %.*s\n"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
#, fuzzy
msgid "Admin PIN"
msgstr "|A|管理员 PIN"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr ""
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr ""
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "再次输入此 PIN："
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
#, fuzzy
msgid "Repeat this PUK"
msgstr "再次输入此 PIN："
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
#, fuzzy
msgid "Repeat this PIN"
msgstr "再次输入此 PIN："
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符；请再试一次"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符；请再试一次"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符；请再试一次"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
@@@ -392,8 -309,6 +392,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "更改密码"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -403,123 -318,94 +403,127 @@@ msgstr "
"选项：\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "密钥被替换"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥服务器上搜寻密钥"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "导入后不更新信任度数据库"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
msgid "|NAME|accept some commands via NAME"
msgstr "|某甲|为收件者“某甲”加密"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
#, fuzzy
msgid "allow presetting passphrase"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "未被支持"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -528,181 -414,138 +532,186 @@@ 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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"请向 <@EMAIL@> 报告程序缺陷。\n"
"请向 <zuxyhere at eastday.com> 反映简体中文翻译的问题。\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "所选的散列算法无效\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 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:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, 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:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败：%s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "正在将私钥写至`%s'\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 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"
msgstr "已创建目录‘%s’\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "更新私钥失败：%s\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s：已跳过：%s\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: 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"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -710,9 -553,6 +719,9 @@@ msgstr "
"@指令：\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -766,8 -598,6 +775,8 @@@ msgstr "已取消
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
@@@ -826,8 -647,6 +835,8 @@@ msgstr "
msgid "Yes"
msgstr "yes"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -878,7 -690,6 +887,7 @@@ msgstr "更改密码
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -886,13 -697,11 +895,13 @@@
"%%0A?"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "启用密钥"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -912,7 -718,6 +921,7 @@@ msgstr "DSA 密钥 %s 使用不安全�
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
@@@ -953,8 -748,6 +962,8 @@@ msgstr "生成密码的时候发生错�
msgid "error creating a stream for a pipe: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -1081,7 -848,6 +1090,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
@@@ -1096,7 -860,6 +1105,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1212,8 -952,6 +1221,8 @@@ msgstr "%s：钥匙环已建立\n
msgid "algorithm: %s"
msgstr "有效性：%s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
@@@ -1406,7 -1106,6 +1415,7 @@@ msgstr "无效的列表选项\n
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, fuzzy, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "无效的列表选项\n"
@@@ -1431,7 -1126,6 +1440,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
#, fuzzy
msgid "out of core\n"
msgstr "可选"
@@@ -1490,8 -1173,6 +1499,8 @@@ msgstr "找不到公钥 %s：%s\n
msgid "waiting for lock %s...\n"
msgstr "等待‘%s’上的锁\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1610,7 -1265,6 +1619,7 @@@ msgstr "
msgid "WARNING: invalid notation data found\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
@@@ -1619,35 -1272,33 +1628,42 @@@
msgid "Enter passphrase: "
msgstr "请输入密码："
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "警告："
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s 尚不能和 %s 并用\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP 卡不可用：%s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@@ -1656,15 -1306,10 +1672,15 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "您的选择？ "
@@@ -1721,147 -1353,100 +1737,132 @@@ msgstr "错误：合成的姓名太长(
msgid "URL to retrieve public key: "
msgstr "获取公钥的 URL："
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "错误：URL 太长(至多 %d 个字符)\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "登录数据(帐号名)："
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "个人 DO 数据："
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "首选语言："
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "错误：首选项字符串长度无效。\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "错误：首选项字符串里有无效字符。\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "错误：无效的响应。\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "CA 指纹："
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "错误：指纹格式无效。\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "针对密钥的操作无法实现：%s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "替换已有的密钥？(y/N)"
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "私钥已存储在卡上\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "替换已有的密钥？(y/N)"
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1876,167 -1461,123 +1877,167 @@@ msgstr "
" PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
"您应当使用 --change-pin 命令来更改它们\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "请选择您要使用的密钥种类：\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) 签名密钥\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) 加密密钥\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "无效的选择。\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "请选择在哪里存储密钥：\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "更新失败：%s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "私钥已存储在卡上\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "为其添加签名吗？(y/N)"
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "离开这个菜单"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "显示管理员命令"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "显示这份在线说明"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "列出所有可用数据"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "更改卡持有人的姓名"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "更改获取密钥的 URL"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "根据卡中指定的 URL 获取密钥"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "更改登录名"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "更改首选语言首选"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "更改卡持有人的性别"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "设定 PIN 签名是否必须"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "生成新的密钥"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "更改或解锁 PIN 的菜单"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "验证 PIN 并列出所有数据"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "仅供管理员使用的命令\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "允许使用管理员命令\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
- #: 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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
@@@ -2098,82 -1627,77 +2099,95 @@@ msgstr "公钥“%s”有对应的私�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "使用对称加密算法 %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "警告：‘%s’是一个空文件\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "正在从‘%s’读取\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "警告：“%s”选项已不建议使用\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给：“%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密过的数据\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的算法 %d 加密\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "处理加密包有问题\n"
@@@ -2256,39 -1763,30 +2270,39 @@@ msgstr "导出时尽可能清除密钥�
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s：已跳过：%s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "正在写入‘%s’\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "密钥 %s：密钥在卡上——已跳过\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2358,233 -1843,185 +2372,238 @@@ msgstr "不可用的私钥
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
- #: g10/getkey.c:3637
++#: g10/getkey.c:3658
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
- #: g10/gpg.c:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "无效的列表选项\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "生成一份分离的签名"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "加密数据"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "验证签名"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "列出密钥"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "列出密钥和签名"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "列出私钥"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "导出密钥"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "把密钥导出到某个公钥服务器上"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "从公钥服务器上导入密钥"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "在公钥服务器上搜寻密钥"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "导入/合并密钥"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "打印卡状态"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "更改卡上的数据"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "更新信任度数据库"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "不做任何改变"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2592,7 -2029,6 +2611,7 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2622,13 -2058,11 +2641,13 @@@ msgstr "
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2643,7 -2077,6 +2662,7 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2651,80 -2084,65 +2670,80 @@@ msgstr "
"\n"
"支持的算法：\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "公钥："
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "对称加密："
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "散列："
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "压缩："
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法：gpg [选项] "
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, 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:1563
++#: g10/gpg.c:1568
#, 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:1566
++#: g10/gpg.c:1571
#, 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:1569
++#: g10/gpg.c:1574
#, 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:1575
++#: g10/gpg.c:1580
#, 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:1578
++#: g10/gpg.c:1583
#, 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:1581
++#: g10/gpg.c:1586
#, 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:1587
++#: g10/gpg.c:1592
#, 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:1590
++#: g10/gpg.c:1595
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2732,19 -2150,16 +2751,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, 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:1599
++#: g10/gpg.c:1604
#, 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:1602
++#: g10/gpg.c:1607
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2753,456 -2168,344 +2772,439 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, 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:1821
++#: g10/gpg.c:1826
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "未知的配置项‘%s’\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
- #: g10/gpg.c:2058 g10/gpg.c:2095
- #, fuzzy, c-format
- msgid "valid values for option '%s':\n"
- msgstr "无效的列表选项\n"
-
- #: g10/gpg.c:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2105 g10/keygen.c:168
- #, fuzzy, c-format
- msgid "invalid value for option '%s'\n"
- msgstr "无效的列表选项\n"
-
- #: g10/gpg.c:2244
++#: g10/gpg.c:2227
#, 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:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, 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:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, 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:3055
++#: g10/gpg.c:3054
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "电子邮件地址无效\n"
- #: g10/gpg.c:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, 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:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
- #: g10/gpg.c:3747
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
- #: g10/gpg.c:3749
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3757
#, 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:3756
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
- #: g10/gpg.c:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
- #: 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:3863
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
#, 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"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
- #: g10/gpg.c:3868
++#: g10/gpg.c:3875
#, 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"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, 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:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: g10/gpg.c:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@@ -3215,7 -2516,6 +3217,7 @@@ msgstr "从这个钥匙环里取用密�
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|FD|把状态信息写入文件描述符 FD"
@@@ -3246,333 -2541,271 +3248,339 @@@ msgstr "没有可用的帮助
msgid "No help available for '%s'"
msgstr "‘%s’没有可用的帮助"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "导入被标记为局部的签名"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "导入时修复 PKS 公钥服务器导致的损坏"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "显示密钥指纹"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "只接受对已有密钥的更新"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "导入后清除密钥中无用的部分"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能清除密钥中的可选部分"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
msgid "assume the GnuPG key backup format"
msgstr ""
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "显示密钥指纹"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量：%lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识：%lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已导入：%lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变：%lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识：%lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥：%lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签名：%lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销：%lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥：%lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥：%lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥：%lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入：%lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 清除的签名：%lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 清除的用户标识：%lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”：对称加密算法 %s 对应首选项\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”：散列算法 %s 对应首选项\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”：压缩算法 %s 对应首选项\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s：没有用户标识\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "“%s”已跳过：%s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s：PKS 子钥破损已修复\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s：找不到公钥：%s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s：新密钥――已跳过\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s：公钥“%s”已导入\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s：与我们的副本不吻合\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s：“%s”一个新的用户标识\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s：“%s”1 个新的签名\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s：“%s”%d 个新的签名\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s：“%s”1 个新的子钥\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s：“%s”%d 个新的子钥\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s：“%s”未改变\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s：私钥已导入\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
@@@ -3587,87 -2820,70 +3595,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s：“%s”吊销证书已被导入\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s：签名没有用户标识\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s：不支持的公钥算法\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s：没有可供绑定的子钥\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s：无效的子钥绑定\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s：已删除多重子钥绑定\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s：无效的子钥吊销\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s：已删除多重子钥吊销\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s：已跳过用户标识“%s”\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s：已跳过子钥\n"
@@@ -3676,52 -2892,42 +3684,52 @@@
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s：已新增吊销证书“%s”\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
@@@ -3764,82 -2963,12 +3772,15 @@@ msgstr "‘%s’中出错：%s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败： %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[吊销]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[自身签名]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "密钥 %s：不支持的公钥算法\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "卡不支持散列算法 %s\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- msgid " (reordered signatures follow)"
- msgstr "完好的签名，来自于“%s”"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
- msgid "key %s:\n"
- msgstr "“%s”已跳过：%s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "密钥 %s：“%s”%d 个签名被清除\n"
- msgstr[1] "密钥 %s：“%s”%d 个签名被清除\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "有 1 份签名因为遗失密钥而未被检查\n"
- msgstr[1] "有 1 份签名因为遗失密钥而未被检查\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d 个损坏的签名\n"
- msgstr[1] "%d 个损坏的签名\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "完好的签名，来自于“%s”"
- msgstr[1] "完好的签名，来自于“%s”"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3850,17 -2979,14 +3791,17 @@@ msgstr "
"查\n"
"指纹等)？\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉强相信\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全相信\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3869,50 -2995,38 +3810,50 @@@ msgstr "
"请输入这份信任签名的深度。\n"
"深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签名吗？(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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " 无法添加签名。\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "用户标识“%s”已过期。"
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "警告：用户标识“%s”不含自身签名。"
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "可以为用户标识“%s”添加签名。"
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "为其添加签名吗？(y/N)"
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3921,65 -3035,52 +3862,65 @@@ msgstr "
"“%s”的自身签名是 PGP 2.x 样\n"
"式的签名。\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr "您目前为“%s”的签名已经过期了。\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr "您目前为“%s”的签名是一份本地签名。\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s”已由密钥 %s 在本地签名\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s”已由密钥 %s 签名\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "您仍然想要为它再次签名吗？(y/N)"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "这把密钥已经过期！"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "这把密钥将在 %s 过期。\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3988,33 -3089,27 +3929,33 @@@ msgstr "
"您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
"如果您不知道这个问题的答案，请输入“0”。\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答。 %s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本没有检查过。 %s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我随意检查过。 %s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地检查过。 %s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "您的选择？(输入‘?’以获得更多的信息)："
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4023,220 -3118,166 +3964,220 @@@ msgstr "
"您真的确定要签名这把密钥，使用您的密钥\n"
"“%s”(%s)\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "这将是一个自身签名。\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告：这份签名不会被标记为不可导出。\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告：这份签名不会被标记成不可吊销。\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "这份签名会被标记成不可导出。\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "这份签名会被标记成不可吊销。\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "我根本没有检查过这把密钥。\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "我随意检查过这把密钥。\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地检查过这把密钥。\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "真的要签名吗？(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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败： %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "保存并离开"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "显示密钥指纹"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
msgid "show the keygrip"
msgstr "输入注记："
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "选择用户标识 N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "选择子钥 N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "检查签名"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签名"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签名"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签名"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "增加一个用户标识"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "增加一个照片标识"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "添加一个子钥"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签名"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "为所选用户标识的设定注记"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "更改密码"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "更改信任度"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签名"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "启用密钥"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "禁用密钥"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "压缩不可用的用户标识并删除不可用的签名"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "压缩不可用的用户标识并删除所有签名"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4254,317 -3295,256 +4195,329 @@@ msgstr "
" 信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "密钥已被吊销。"
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗？(y/N)"
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗？(y/N)"
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示：选择要添加签名的用户标识\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "未知的签名类型‘%s’\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识！\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗？(y/N)"
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "真的要删除这个用户标识吗？(y/N)"
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗？(y/N)"
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "无法打开‘%s’：%s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "从‘%s’读取备份密钥时出错：%s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗？(y/N)"
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗？(y/N)"
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗？(y/N)"
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗？(y/N)"
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗？(y/N)"
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "设为首选项列表为：\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗？(y/N)"
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "要保存变动吗？(y/N)"
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗？(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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败：%s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "您不能删除最后一个用户标识！\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
msgid "revoking the user ID failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
msgid "setting the primary user ID failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "指纹无效"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "无法存储指纹：%s\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "无效的数值\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "没有这个用户标识。\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "invalid fingerprint"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "指纹无效"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "密钥‘%s’找不到：%s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "散列："
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "特点："
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "首选公钥服务器："
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "注记："
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr " (敏感的)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "创建于：%s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "已吊销：%s"
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "已过期：%s"
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "有效至：%s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "可用于：%s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "卡号："
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "信任度：%s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "有效性：%s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"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:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "已过期"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
"警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4573,35 -3553,27 +4526,35 @@@ msgstr "
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗？(y/N)"
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签名吗？(y/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签名吗？(y/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签名吗？(y/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签名吗？(y/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4609,37 -3581,30 +4562,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "已经删除了 %d 个签名。\n"
msgstr[1] "已经删除了 %d 个签名。\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "无效"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "密钥 %s：“%s”%d 个签名被清除\n"
msgstr[1] "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4648,42 -3613,34 +4601,42 @@@ msgstr "
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识："
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4692,172 -3649,139 +4645,177 @@@ msgid "
"N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL："
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗？(y/N)"
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗？(y/N)"
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "输入注记："
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "继续？(y/N)"
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识：“%s”\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (不可导出)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗？(y/N)"
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (不可吊销)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名：\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗？(y/N)"
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "没有私钥\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "您不能删除最后一个用户标识！\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "无效的列表选项\n"
+
+#: g10/keygen.c:317
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
@@@ -5295,8 -4142,6 +5253,8 @@@ msgstr "
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
@@@ -5373,7 -4205,6 +5331,7 @@@ msgstr "写入公钥钥匙环‘%s’�
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5381,61 -4212,48 +5339,61 @@@ msgstr "
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "永不过期"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "关键签名策略："
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "签名策略："
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "关键首选公钥服务器："
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "关键签名注记："
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "签名注记："
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5443,7 -4261,20 +5401,23 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d 个损坏的签名\n"
msgstr[1] "%d 个损坏的签名\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d 个损坏的签名\n"
+ msgstr[1] "%d 个损坏的签名\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "有 1 份签名因为遗失密钥而未被检查\n"
+ msgstr[1] "有 1 份签名因为遗失密钥而未被检查\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5451,41 -4282,33 +5425,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "有 1 份签名因为某个错误而未被检查\n"
msgstr[1] "有 1 份签名因为某个错误而未被检查\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, 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] ""
msgstr[1] ""
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "钥匙环"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr "主钥指纹："
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr "子钥指纹："
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " 主钥指纹："
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " 子钥指纹："
# use tty
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr "卡序列号 ="
@@@ -5595,262 -4397,213 +5569,268 @@@ msgstr "在公钥服务器上找不到�
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s，从 %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "公钥服务器无动作！\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "“%s”已跳过：%s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "下载密钥 %s，从 %s\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告：无法获取 URI %s：%s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密过的会话密钥尺寸(%d)诡异\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密过的会话密钥\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "公钥是 %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "公钥加密过的数据：完好的数据加密密钥\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、钥匙号为 %s\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公钥解密失败：%s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "以 %lu 个密码加密\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 算法不可用，试以 %s 代替\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "警告：报文未受到完整的保护\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "解密成功\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告：加密过的报文已经变造！\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败：%s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "注意：发件者要求您“只阅读不存盘”\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "未找到签名\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名，来自于“%s”"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名，来自于“%s”"
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名，来自于“%s”"
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " 亦即“%s”"
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "可用的密钥在："
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[不确定]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "警告：这把密钥未经受信任的签名认证！\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s 签名，散列算法 %s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "二进制"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "文本模式"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "未知的公钥算法"
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名：%s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告：检测到多重签名。只检查第一个签名。\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
@@@ -5912,70 -4654,57 +5892,70 @@@ msgstr "读取‘%s’错误：%s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d：不建议使用该选项“%s”\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "请以“%s%s”代替\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "不压缩"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "未压缩|无"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "有歧义的选项‘%s’\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
#, 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:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6477,36 -5107,33 +6457,41 @@@ msgstr "无法打开有签名的数据�
msgid "can't open signed data fd=%d: %s\n"
msgstr "无法打开有签名的数据‘%s’\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "密钥 %s：没有有效的用户标识\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "很好，我们就是匿名收件者。\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "不支持旧式的 DEK 编码\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "对称加密算法 %d%s 未知或已停用\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "注意：收件人的首选项中找不到加密算法 %s\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "注意：私钥 %s 已于 %s 过期\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
#, fuzzy
#| msgid "NOTE: key has been revoked"
msgid "Note: key has been revoked"
@@@ -6666,7 -5265,6 +6651,7 @@@ msgstr "(不给定描述)\n
msgid "Is this okay? (y/N) "
msgstr "这样可以吗？ (y/N)"
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "建立了弱密钥――正在重试\n"
@@@ -6686,26 -5281,26 +6671,32 @@@ msgstr "DSA 密钥 %s 使用不安全�
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "警告：签名散列值与报文不一致\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "您不该将 %s 用于 %s 模式中\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "警告：签名的子钥 %s 未经交叉验证\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "请参见 %s 以得到更多信息。\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "警告：签名的子钥 %s 交叉验证无效\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6713,7 -5308,6 +6704,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6721,7 -5315,6 +6712,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6732,7 -5325,6 +6723,7 @@@ msgid_plural "
msgstr[0] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
msgstr[1] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6742,84 -5334,68 +6733,84 @@@ msgid_plural "
msgstr[0] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
msgstr[1] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "注意：签名密钥 %s 已于 %s 过期\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "注意：密钥已被吊销"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签名来自：“%s”\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "正在签名："
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
- #: g10/skclist.c:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "“%s”已跳过：重复\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
@@@ -6907,7 -5467,6 +6898,7 @@@ msgstr "信任度数据库处理量过�
msgid "%s: directory does not exist!\n"
msgstr "%s：目录不存在！\n"
- #: g10/tdbio.c:704 dirmngr/http.c:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7020,150 -5557,121 +7011,150 @@@ msgstr "无法处理长于 %d 字符的
msgid "input line longer than %d characters\n"
msgstr "输入行长度超过 %d 字符\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"支持的算法：\n"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
msgstr[1] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "列出密钥和用户标识"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性：%s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出密钥"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7171,68 -5679,58 +7162,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "以 %lu 个密码加密\n"
msgstr[1] "以 %lu 个密码加密\n"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
@@@ -7240,149 -5738,123 +7231,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "已经删除了 %d 个签名。\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "以 %lu 个密码加密\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "有效性：%s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7399,18 -5871,14 +7390,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7649,19 -6072,14 +7640,19 @@@ msgid "
"List, export, import Keybox data\n"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误：%s\n"
@@@ -7710,44 -6119,35 +7701,44 @@@ msgid "
"qualified signatures."
msgstr ""
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "无法存储指纹：%s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "无法存储创建日期：%s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public key\n"
msgstr "响应未包含 RSA 公钥指数\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥：%s\n"
@@@ -7755,54 -6155,43 +7746,54 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
msgid "||Please unlock the card"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败：%s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定！\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7813,26 -6202,21 +7804,26 @@@ msgstr[1] "尝试管理员 PIN %d 次�
#. 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
++#: scd/app-openpgp.c:2260
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, fuzzy, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
@@@ -7840,82 -6224,64 +7831,82 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr ""
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "新的 PIN"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
#, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
#, fuzzy
msgid "||Please enter the PIN and New PIN"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "密钥已存在\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "生成新密钥\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
#, fuzzy
msgid "writing new key\n"
msgstr "生成新密钥\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥：%s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported URI"
msgid "unsupported curve\n"
msgstr "未被支持的 URI"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "请稍候，正在生成密钥……\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
@@@ -7923,30 -6289,24 +7914,30 @@@ msgid_plural "key generation completed
msgstr[0] "密钥已生成(耗时 %d 秒)\n"
msgstr[1] "密钥已生成(耗时 %d 秒)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr ""
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名：%lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@@ -7968,11 -6325,9 +7959,11 @@@ msgstr "新的 PIN
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "从‘%s’读取选项\n"
@@@ -8025,12 -6369,10 +8016,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8104,9 -6431,6 +8095,9 @@@ msgstr "生成密码的时候发生错�
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "无法读出公钥：%s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "无法存储密钥：%s\n"
@@@ -8294,7 -6578,6 +8285,7 @@@ msgstr "
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@@ -8338,7 -6614,6 +8329,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
@@@ -8605,11 -6827,9 +8596,11 @@@ msgstr "
msgid "resource problem: out of core\n"
msgstr ""
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr ""
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@@ -8638,140 -6853,109 +8629,140 @@@ msgstr "首选项‘%s’重复\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(不给定描述)\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
#, fuzzy
msgid "list external keys"
msgstr "列出私钥"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
#, fuzzy
msgid "list certificate chain"
msgstr "证书已损坏"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
#, fuzzy
msgid "import certificates"
msgstr "证书已损坏"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
#, fuzzy
msgid "export certificates"
msgstr "证书已损坏"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
#, fuzzy
msgid "register a smartcard"
msgstr "在智能卡上添加一把密钥"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
#, fuzzy
msgid "create base-64 encoded output"
msgstr "输出经 ASCII 封装"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr ""
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "从‘%s’读取选项\n"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr ""
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr ""
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr ""
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "从这个钥匙环里取用密钥"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "未知的对称加密算法"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s 签名，散列算法 %s\n"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8782,47 -6966,38 +8773,47 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "无法连接至‘%s’：%s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(不给定描述)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8885,7 -7048,6 +8876,7 @@@ msgstr "
msgid "error storing flags: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr ""
@@@ -8914,7 -7072,6 +8905,7 @@@ msgid "
"%s%sAre you really sure that you want to do this?"
msgstr ""
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8928,51 -7084,41 +8919,51 @@@ msgid "
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
- #: sm/sign.c:454
++#: sm/sign.c:465
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "保护算法 %d%s 未被支持\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
- #: sm/sign.c:520
++#: sm/sign.c:560
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
#, fuzzy
msgid "Signature made "
msgstr "签名建立于 %s\n"
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr ""
- #: sm/verify.c:462
++#: sm/verify.c:491
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
- #: sm/verify.c:602
++#: sm/verify.c:631
#, fuzzy
msgid "Good signature from"
msgstr "完好的签名，来自于“%s”"
- #: sm/verify.c:603
++#: sm/verify.c:632
#, fuzzy
msgid " aka"
msgstr " 亦即“%s”"
- #: sm/verify.c:621
++#: sm/verify.c:650
#, fuzzy
msgid "This is a qualified signature\n"
msgstr "这将是一个自身签名。\n"
@@@ -9778,117 -7763,89 +9769,117 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "要不保存而离开吗？(y/N)"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "无法解析公钥服务器 URL\n"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9901,95 -7858,76 +9892,95 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "用法：gpg [选项] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s 不可与 %s 并用\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "列太长"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "指纹无效"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "读取‘%s’错误：%s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "可选"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10173,7 -8075,14 +10164,18 @@@ msgstr "“%s”不是一个 JPEG 文�
msgid "'%s' is an invalid LDAP URL\n"
msgstr ""
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, fuzzy, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "读取‘%s’时出错：%s\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, fuzzy, c-format
msgid "error printing log line: %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
@@@ -10240,12 -8137,10 +10242,12 @@@ msgstr "将密钥‘%s’上传到 %s �
msgid "malloc failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10310,12 -8193,6 +10312,7 @@@ msgstr "写入钥匙环‘%s’时出�
msgid "error reading HTTP response for '%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/ocsp.c:242
- #, fuzzy, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "读取‘%s’时出错：%s\n"
-
+#: dirmngr/ocsp.c:267
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
@@@ -10435,78 -8288,62 +10432,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "无法存储创建日期：%s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10643,192 -8451,145 +10640,192 @@@ msgstr "签名时失败： %s\n
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr ""
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "从导出的子钥中删除所有密码"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "生成密码的时候发生错误：%s\n"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr ""
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|某甲|为收件者“某甲”加密"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "无法解析公钥服务器 URL\n"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "网络错误"
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
msgid "Passphrase Entry"
msgstr "错误的密码"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
#, fuzzy
msgid "Component not suitable for launching"
msgstr "找不到公钥"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "‘%s’中出错：%s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -10902,27 -8647,22 +10899,27 @@@ msgstr "指定输出文件
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
#, fuzzy
msgid "Component not found"
msgstr "找不到公钥"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
#, fuzzy
msgid "No argument allowed"
msgstr "不允许使用管理员命令\n"
diff --cc po/zh_TW.po
index 03abf4d,83f9ca9..1a7ffa2
--- 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-05-15 16:15+0200\n"
++"POT-Creation-Date: 2017-07-28 19: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"
@@@ -21,7 -20,6 +21,7 @@@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.5.7\n"
- #: agent/call-pinentry.c:296
++#: agent/call-pinentry.c:300
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
@@@ -32,47 -30,38 +32,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:499
++#: agent/call-pinentry.c:503
msgid "|pinentry-label|_OK"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:500
++#: agent/call-pinentry.c:504
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|取消 (_C)"
- #: agent/call-pinentry.c:501
++#: agent/call-pinentry.c:505
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:502
++#: agent/call-pinentry.c:506
#, fuzzy
#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
msgstr "|pinentry-label|_OK"
- #: agent/call-pinentry.c:503
++#: agent/call-pinentry.c:507
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|個人識別碼 (PIN):"
- #: agent/call-pinentry.c:504
++#: agent/call-pinentry.c:508
#, fuzzy
#| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
msgstr "|pinentry-label|取消 (_C)"
- #: agent/call-pinentry.c:505
++#: agent/call-pinentry.c:509
#, fuzzy
#| msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgid "Do you really want to make your passphrase visible on the screen?"
msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
- #: agent/call-pinentry.c:507
++#: agent/call-pinentry.c:511
msgid "|pinentry-tt|Make passphrase visible"
msgstr ""
- #: agent/call-pinentry.c:508
++#: agent/call-pinentry.c:512
#, fuzzy
#| msgid "Enter new passphrase"
msgid "|pinentry-tt|Hide passphrase"
@@@ -80,7 -69,6 +80,7 @@@ msgstr "請輸入新密語
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:840
++#: agent/call-pinentry.c:844
msgid "Quality:"
msgstr "優劣程度: %s"
@@@ -90,71 -78,55 +90,71 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:861
++#: agent/call-pinentry.c:865
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"上列輸入文字的優劣程度.\n"
"關於此規範的細節, 請洽你的系統管理者."
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:993
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
- #: agent/call-pinentry.c:992
++#: agent/call-pinentry.c:996
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
++#: agent/call-pinentry.c:1033 agent/call-pinentry.c:1212
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
msgstr "密語:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
++#: agent/call-pinentry.c:1060 agent/command-ssh.c:3125 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "前後不一致 - 請再試一次"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:1076
++#: agent/call-pinentry.c:1080
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
- #: agent/call-pinentry.c:1087
++#: agent/call-pinentry.c:1091
msgid "Repeat:"
msgstr "重複:"
- #: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
++#: agent/call-pinentry.c:1120 agent/call-pinentry.c:1132
msgid "PIN too long"
msgstr "個人識別碼 (PIN) 太長"
- #: agent/call-pinentry.c:1117
++#: agent/call-pinentry.c:1121
msgid "Passphrase too long"
msgstr "密語太長"
- #: agent/call-pinentry.c:1125
++#: agent/call-pinentry.c:1129
msgid "Invalid characters in PIN"
msgstr "個人識別碼 (PIN) 含有無效的字符"
- #: agent/call-pinentry.c:1130
++#: agent/call-pinentry.c:1134
msgid "PIN too short"
msgstr "個人識別碼 (PIN) 太短"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad PIN"
msgstr "不良的個人識別碼 (PIN)"
- #: agent/call-pinentry.c:1143
++#: agent/call-pinentry.c:1147
msgid "Bad Passphrase"
msgstr "不良的密語"
@@@ -163,57 -134,35 +163,57 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
- #: 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
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1316 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:885
++#: g10/sign.c:1188 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "無法建立 '%s': %s\n"
- #: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:852
+#: 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:1312
- #: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
++#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1317
++#: g10/import.c:330 g10/import.c:474 g10/import.c:642 g10/keygen.c:3671
+#: 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/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:867 g10/sign.c:1067
++#: g10/sign.c:1172 g10/sign.c:1317 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
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
#, c-format
msgid "can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
- #: 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
++#: agent/command-ssh.c:2412 agent/command-ssh.c:2458 agent/command-ssh.c:2476
++#: agent/command-ssh.c:2628 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:2448
++#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "偵測到卡片, 其序號為: %s\n"
- #: agent/command-ssh.c:2453
++#: agent/command-ssh.c:2467
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
- #: agent/command-ssh.c:2473
++#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "找不到合適的卡片金鑰: %s\n"
- #: agent/command-ssh.c:2600
++#: agent/command-ssh.c:2614
#, 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:2774
++#: agent/command-ssh.c:2788
#, 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:2781
++#: agent/command-ssh.c:2795
msgid "Allow"
msgstr "允許"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2795
msgid "Deny"
msgstr "拒絕"
- #: agent/command-ssh.c:2790
++#: agent/command-ssh.c:2804
#, 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:3028 agent/genkey.c:351
++#: agent/command-ssh.c:3053 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "請再次輸入密語"
- #: agent/command-ssh.c:3055
++#: agent/command-ssh.c:3080
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -246,63 -190,49 +246,63 @@@
msgstr ""
"請輸入密語以保護收到的私鑰 %%0A %s%%0A %s%%0A 於 gpg-agent 的金鑰存放處"
- #: agent/command-ssh.c:3635
++#: agent/command-ssh.c:3660
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "從 socket 建立串流失敗: %s\n"
- #: agent/divert-scd.c:115
++#: agent/divert-scd.c:117
msgid "Please insert the card with serial number"
msgstr "請插入下列序號的卡片:"
- #: agent/divert-scd.c:116
++#: agent/divert-scd.c:118
msgid "Please remove the current card and insert the one with serial number"
msgstr "請移除現用中的卡片並插入下列序號的卡片:"
- #: agent/divert-scd.c:244
++#: agent/divert-scd.c:246
msgid "Admin PIN"
msgstr "管理者個人識別碼 (PIN)"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
- #: agent/divert-scd.c:249
++#: agent/divert-scd.c:251
msgid "PUK"
msgstr "PIN 重設碼 (PUK)"
- #: agent/divert-scd.c:256
++#: agent/divert-scd.c:258
msgid "Reset Code"
msgstr "重設碼"
- #: agent/divert-scd.c:282
++#: agent/divert-scd.c:284
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0A使用讀卡機的鍵盤來輸入."
- #: agent/divert-scd.c:354
++#: agent/divert-scd.c:356
msgid "Repeat this Reset Code"
msgstr "請再次輸入重設碼"
- #: agent/divert-scd.c:356
++#: agent/divert-scd.c:358
msgid "Repeat this PUK"
msgstr "請再次輸入 PUK"
- #: agent/divert-scd.c:357
++#: agent/divert-scd.c:359
msgid "Repeat this PIN"
msgstr "請再次輸入個人識別碼 (PIN)"
- #: agent/divert-scd.c:362
++#: agent/divert-scd.c:364
msgid "Reset Code not correctly repeated; try again"
msgstr "前後兩次輸入的重設碼不一致; 請再試一次"
- #: agent/divert-scd.c:364
++#: agent/divert-scd.c:366
msgid "PUK not correctly repeated; try again"
msgstr "前後兩次輸入的 PUK 不一致; 請再試一次"
- #: agent/divert-scd.c:365
++#: agent/divert-scd.c:367
msgid "PIN not correctly repeated; try again"
msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
- #: agent/divert-scd.c:378
++#: agent/divert-scd.c:380
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開卡片"
@@@ -376,8 -293,6 +376,8 @@@ msgstr "請輸入密語至%0A以保護�
msgid "Please enter the new passphrase"
msgstr "請輸入新的密語"
- #: agent/gpg-agent.c:150 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:151 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -385,138 -300,102 +385,142 @@@ msgstr "
"@選項:\n"
" "
- #: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:153 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
msgid "run in daemon mode (background)"
msgstr "以服務模式執行 (背景)"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:154 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
msgid "run in server mode (foreground)"
msgstr "以伺服器模式執行 (前景)"
- #: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:156 dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "以伺服器模式執行"
- #: 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
++#: agent/gpg-agent.c:158 g10/gpg.c:595 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:176 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
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
++#: agent/gpg-agent.c:159 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "盡量安靜些"
- #: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:160 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
msgid "sh-style command output"
msgstr "sh 樣式的指令輸出"
- #: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:161 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
msgid "csh-style command output"
msgstr "csh 樣式的指令輸出"
- #: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:162 scd/scdaemon.c:120 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|檔案|從指定檔案中讀取選項"
- #: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
++#: agent/gpg-agent.c:171 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
msgid "do not detach from the console"
msgstr "不要從 console 分離"
- #: agent/gpg-agent.c:171
++#: agent/gpg-agent.c:172
msgid "do not grab keyboard and mouse"
msgstr "不要奪取鍵盤及滑鼠"
- #: agent/gpg-agent.c:172 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:173 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "為伺服器使用日誌檔"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
- #: agent/gpg-agent.c:179
++#: agent/gpg-agent.c:180
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:182
msgid "do not use the SCdaemon"
msgstr "不要使用 SCdaemon"
- #: agent/gpg-agent.c:185
++#: agent/gpg-agent.c:186
#, fuzzy
#| msgid "|NAME|connect to host NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|名稱|連線至位於指定名稱的主機"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "ignore requests to change the TTY"
msgstr "忽略變更 TTY 的要求"
- #: agent/gpg-agent.c:203
++#: agent/gpg-agent.c:204
msgid "ignore requests to change the X display"
msgstr "忽略變更 X display 的要求"
- #: agent/gpg-agent.c:206
++#: agent/gpg-agent.c:207
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:221
msgid "do not use the PIN cache when signing"
msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "不允許重複使用舊密語"
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:225
msgid "disallow clients to mark keys as \"trusted\""
msgstr "不允許用戶端將金鑰標記為 \"已信任\""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:228
msgid "allow presetting passphrase"
msgstr "允許預先設定密語"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:230
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:233
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:235
msgid "enable ssh support"
msgstr "啟用 ssh 支援"
+#: agent/gpg-agent.c:237
+ msgid "|ALGO|use ALGO to show ssh fingerprints"
+ msgstr ""
+
++#: agent/gpg-agent.c:240
msgid "enable putty support"
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: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
++#: agent/gpg-agent.c:496 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1035 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:389
+#: 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
++#: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
- #: agent/gpg-agent.c:494
++#: agent/gpg-agent.c:505
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
- #: agent/gpg-agent.c:496
++#: agent/gpg-agent.c:507
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -524,144 -403,110 +528,149 @@@ msgstr "
"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:465
++#: agent/gpg-agent.c:552 g10/gpg.c:1226 scd/scdaemon.c:350 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:473
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "給定的除錯等級 '%s' 無效\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:896
++#: agent/gpg-agent.c:903 g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1607
++#: sm/gpgsm.c:1613
+ msgid "selected digest algorithm is invalid\n"
+ msgstr "所選的摘要演算法無效\n"
+
++#: agent/gpg-agent.c:1116 g10/gpg.c:2502 scd/scdaemon.c:503 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:943
#, 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:2519
- #: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
- #: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1127 agent/gpg-agent.c:1989 g10/gpg.c:2506
++#: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
++#: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "選項檔 '%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:909
++#: agent/gpg-agent.c:1135 g10/gpg.c:2513 scd/scdaemon.c:516 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:956
#, c-format
msgid "reading options from '%s'\n"
msgstr "從 '%s' 讀取選項中\n"
- #: 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
++#: agent/gpg-agent.c:1258 g10/gpg.c:3670 scd/scdaemon.c:635 sm/gpgsm.c:1547
++#: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "請注意: '%s' 並不當成選項\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
++#: agent/gpg-agent.c:2134 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
#, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 socket: %s\n"
- #: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
++#: agent/gpg-agent.c:2151 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "socket 名稱 '%s' 太長\n"
- #: agent/gpg-agent.c:2156
++#: agent/gpg-agent.c:2190
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
- #: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
++#: agent/gpg-agent.c:2201 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
++#: agent/gpg-agent.c:2206 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
- #: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1215
++#: agent/gpg-agent.c:2217 agent/gpg-agent.c:2256 scd/scdaemon.c:1127
++#: dirmngr/dirmngr.c:1261
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
- #: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
++#: agent/gpg-agent.c:2222 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() 失敗: %s\n"
- #: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
++#: agent/gpg-agent.c:2230 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
#, c-format
msgid "listening on socket '%s'\n"
msgstr "正在候聽 socket '%s'\n"
- #: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
++#: agent/gpg-agent.c:2250 agent/gpg-agent.c:2293 g10/exec.c:199
+#: 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:398
++#: agent/gpg-agent.c:2253 agent/gpg-agent.c:2298 g10/openfile.c:398
+#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "目錄 '%s' 已建立\n"
- #: agent/gpg-agent.c:2266
++#: agent/gpg-agent.c:2304
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s' 的 stat() 失敗: %s\n"
- #: agent/gpg-agent.c:2270
++#: agent/gpg-agent.c:2308
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "無法使用 '%s' 做為家目錄\n"
- #: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
++#: agent/gpg-agent.c:2460 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
- #: agent/gpg-agent.c:2620
++#: agent/gpg-agent.c:2667
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2625
++#: agent/gpg-agent.c:2672
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2700
++#: agent/gpg-agent.c:2747
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2705
++#: agent/gpg-agent.c:2752
#, c-format
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:2162
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
- #: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:3055 scd/scdaemon.c:1387
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
- #: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3193 common/simple-pwquery.c:247 g10/call-agent.c:253
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
- #: agent/preset-passphrase.c:99
++#: agent/preset-passphrase.c:100
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
- #: agent/preset-passphrase.c:102
++#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
@@@ -669,8 -514,6 +678,8 @@@ msgstr "
"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
"密碼快取維護\n"
- #: 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
++#: agent/protect-tool.c:106 g10/gpg.c:431 kbx/kbxutil.c:71 sm/gpgsm.c:199
++#: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -678,9 -521,6 +687,9 @@@ msgstr "
"@指令:\n"
" "
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:540 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:174 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -733,8 -565,6 +742,8 @@@ msgstr "已取消\n
msgid "error while asking for the passphrase: %s\n"
msgstr "詢問密語時出錯: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1559
- #: tools/gpgconf.c:328
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
++#: tools/gpgconf.c:329
#, c-format
msgid "error opening '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
@@@ -792,8 -613,6 +801,8 @@@ msgstr "請問你是否徹底信任%%0
msgid "Yes"
msgstr "Yes"
- #: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/trustlist.c:673 agent/findkey.c:1515 agent/findkey.c:1529
+#: common/audit.c:469
msgid "No"
msgstr "No"
@@@ -843,7 -655,6 +852,7 @@@ msgstr "更改密語
msgid "I'll change it later"
msgstr "我稍後再變更"
- #: agent/findkey.c:1490
++#: agent/findkey.c:1491
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -851,11 -662,9 +860,11 @@@
"%%0A?"
msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
- #: agent/findkey.c:1514 agent/findkey.c:1528
++#: agent/findkey.c:1515 agent/findkey.c:1529
msgid "Delete key"
msgstr "刪除金鑰"
- #: agent/findkey.c:1525
++#: agent/findkey.c:1526
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -877,7 -683,6 +886,7 @@@ msgstr "金鑰 %s 使用不安全 (%u �
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
- #: agent/pksign.c:517
++#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "檢查已建立的簽章時出錯: %s\n"
@@@ -915,8 -710,6 +924,8 @@@ msgstr "建立管道時出錯: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "建立管道串流時出錯: %s\n"
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1244
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
#, c-format
msgid "error forking process: %s\n"
msgstr "衍生執行程序時出錯: %s\n"
@@@ -1043,7 -810,6 +1052,7 @@@ msgstr "在安全記憶體配置 %lu �
msgid "out of core while allocating %lu bytes"
msgstr "配置 %lu 位元組時超出核心"
- #: common/miscellaneous.c:115 g10/card-util.c:865 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:859 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "配置足夠的記憶體時出錯: %s\n"
@@@ -1058,7 -822,6 +1067,7 @@@ msgstr "%s:%u: 廢棄的 \"%s\" 選項
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
- #: common/miscellaneous.c:607
++#: common/miscellaneous.c:617
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1164,8 -904,6 +1173,8 @@@ msgstr "階段金鑰已建立
msgid "algorithm: %s"
msgstr "演算法: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3256
++#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
msgstr "未支援的演算法: %s"
@@@ -1331,7 -1031,6 +1340,7 @@@ msgstr "無效的選項
msgid "missing argument for option \"%.50s\"\n"
msgstr "\"%.50s\" 選項遺失了引數\n"
- #: common/argparse.c:391
++#: common/argparse.c:391 g10/gpg.c:3475
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
msgstr "選項 \"%.50s\" 的引數無效\n"
@@@ -1356,7 -1051,6 +1365,7 @@@ msgstr "\"%.50s\" 選項不明確\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" 指令不明確\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1262
++#: common/argparse.c:401 dirmngr/dirmngr.c:1308
msgid "out of core\n"
msgstr "超出核心\n"
@@@ -1414,8 -1097,6 +1423,8 @@@ msgstr "未鎖定 '%s': %s\n
msgid "waiting for lock %s...\n"
msgstr "正在等候 `%s' 鎖定...\n"
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:805
- #: dirmngr/dirmngr.c:814
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
++#: dirmngr/dirmngr.c:857
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
@@@ -1539,7 -1194,6 +1548,7 @@@ msgstr "標記名稱一定要採用可�
msgid "WARNING: invalid notation data found\n"
msgstr "警告: 找到無效的標記資料\n"
- #: g10/call-agent.c:144 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:218
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
@@@ -1548,35 -1201,33 +1557,42 @@@
msgid "Enter passphrase: "
msgstr "請輸入密語: "
- #: g10/call-agent.c:197 sm/call-agent.c:98 sm/call-dirmngr.c:165
++#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/call-agent.c:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
++#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:209 sm/call-agent.c:110 sm/call-dirmngr.c:177
++#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1770
++#: g10/call-agent.c:294 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
++#: sm/call-agent.c:184 sm/encrypt.c:425 sm/sign.c:345
+ #, fuzzy, c-format
+ #| msgid "%s does not yet work with %s\n"
+ msgid "%s is not compliant with %s mode\n"
+ msgstr "%s 還沒辦法跟 %s 一起運作\n"
+
++#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1745
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "沒有可用的 OpenPGP 卡片: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1776
++#: g10/card-util.c:91 g10/card-util.c:1751
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
++#: g10/card-util.c:99 g10/card-util.c:1948 g10/delkey.c:128 g10/keyedit.c:1420
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
@@@ -1584,14 -1234,9 +1600,14 @@@
msgid "This command is only available for version 2 cards\n"
msgstr "祇有第二版卡片纔能用這個指令\n"
- #: g10/card-util.c:109 scd/app-openpgp.c:2612
++#: g10/card-util.c:109 scd/app-openpgp.c:2629
msgid "Reset Code not or not anymore available\n"
msgstr "(再也) 沒有重設碼\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/card-util.c:142 g10/card-util.c:1511 g10/card-util.c:1627
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 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 "你要選哪一個? "
@@@ -1648,90 -1280,55 +1664,75 @@@ msgstr "錯誤: 合併後的名字太�
msgid "URL to retrieve public key: "
msgstr "取回公鑰的 URL: "
- #: g10/card-util.c:782
- #, c-format
- msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "錯誤: URL 太長 (上限是 %d 個字符).\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
++#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:359
++#: g10/import.c:613 g10/import.c:661 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
++#: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
#, c-format
msgid "error reading '%s': %s\n"
msgstr "讀取 '%s' 時出錯: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "寫入 '%s' 時出錯: %s\n"
- #: g10/card-util.c:937
++#: g10/card-util.c:928
msgid "Login data (account name): "
msgstr "登入資料 (帳號名稱): "
- #: g10/card-util.c:947
- #, c-format
- msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
-
- #: g10/card-util.c:983
++#: g10/card-util.c:966
msgid "Private DO data: "
msgstr "私人的 DO 資料: "
- #: g10/card-util.c:993
- #, c-format
- msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
-
- #: g10/card-util.c:1076
++#: g10/card-util.c:1051
msgid "Language preferences: "
msgstr "介面語言偏好設定: "
- #: g10/card-util.c:1084
++#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
msgstr "錯誤: 無效的偏好設定字串長度\n"
- #: g10/card-util.c:1093
++#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
- #: g10/card-util.c:1115
++#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性別 ((M)男性, (F)女性或留空): "
- #: g10/card-util.c:1129
++#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
msgstr "錯誤: 無效的回應.\n"
- #: g10/card-util.c:1151
++#: g10/card-util.c:1126
msgid "CA fingerprint: "
msgstr "憑證中心 (CA) 指紋: "
- #: g10/card-util.c:1174
++#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
msgstr "錯誤: 無效的格式化指紋.\n"
- #: g10/card-util.c:1224
++#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
msgstr "不可能進行金鑰操作: %s\n"
- #: g10/card-util.c:1225
++#: g10/card-util.c:1200
msgid "not an OpenPGP card"
msgstr "這不是 OpenPGP 卡片"
- #: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
++#: g10/card-util.c:1213 g10/keygen.c:4096 g10/keygen.c:5127
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得現用金鑰資訊時出錯: %s\n"
- #: g10/card-util.c:1325
++#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
msgstr "是否要取代既有的金鑰? (y/N) "
- #: g10/card-util.c:1342
++#: g10/card-util.c:1317
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"
@@@ -1741,55 -1338,43 +1742,55 @@@ msgstr "
" 如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
" 看看這張卡片支援哪些尺寸.\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1342
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1369
++#: g10/card-util.c:1344
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1370
++#: g10/card-util.c:1345
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1381 g10/keygen.c:2111 g10/keygen.c:2143
++#: g10/card-util.c:1356 g10/keygen.c:2111 g10/keygen.c:2143
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "加大到 %u 位元\n"
- #: g10/card-util.c:1389 g10/keygen.c:2196 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1364 g10/keygen.c:2196 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
- #: g10/card-util.c:1394
++#: g10/card-util.c:1369
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
- #: g10/card-util.c:1414
++#: g10/card-util.c:1389
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
- #: g10/card-util.c:1438
++#: g10/card-util.c:1413
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
- #: g10/card-util.c:1452
++#: g10/card-util.c:1427
msgid "Note: keys are already stored on the card!\n"
msgstr "請注意: 金鑰已經存放在卡片上了!\n"
- #: g10/card-util.c:1455
++#: g10/card-util.c:1430
msgid "Replace existing keys? (y/N) "
msgstr "是否要取代既有的金鑰? (y/N) "
- #: g10/card-util.c:1467
++#: g10/card-util.c:1442
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1800,167 -1385,123 +1801,167 @@@ msgstr "
" PIN = '%s' 管理者 PIN = '%s'\n"
"你應該用 --change-pin 指令來加以變更\n"
- #: g10/card-util.c:1527
++#: g10/card-util.c:1502
msgid "Please select the type of key to generate:\n"
msgstr "請選擇你要產生的金鑰種類:\n"
- #: g10/card-util.c:1529 g10/card-util.c:1643
++#: g10/card-util.c:1504 g10/card-util.c:1618
msgid " (1) Signature key\n"
msgstr " (1) 簽署用金鑰\n"
- #: g10/card-util.c:1530 g10/card-util.c:1645
++#: g10/card-util.c:1505 g10/card-util.c:1620
msgid " (2) Encryption key\n"
msgstr " (2) 加密用金鑰\n"
- #: g10/card-util.c:1531 g10/card-util.c:1647
++#: g10/card-util.c:1506 g10/card-util.c:1622
msgid " (3) Authentication key\n"
msgstr " (3) 憑證用金鑰\n"
- #: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
++#: g10/card-util.c:1523 g10/card-util.c:1647 g10/keyedit.c:898
+#: 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 "無效的選擇.\n"
- #: g10/card-util.c:1640
++#: g10/card-util.c:1615
msgid "Please select where to store the key:\n"
msgstr "請選擇要把金鑰存放在哪裡:\n"
- #: g10/card-util.c:1686
++#: g10/card-util.c:1661
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "KEYTOCARD 失敗: %s\n"
- #: g10/card-util.c:1782
++#: g10/card-util.c:1757
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "在 %s 模式中不允許使用這個指令.\n"
- #: g10/card-util.c:1787
++#: g10/card-util.c:1762
#, fuzzy
#| msgid "Note: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "請注意: 金鑰已經存放在卡片上了!\n"
- #: g10/card-util.c:1790
++#: g10/card-util.c:1765
#, fuzzy
#| msgid "Continue? (Y/n) "
msgid "Continue? (y/N) "
msgstr "是否繼續? (Y/n) "
- #: g10/card-util.c:1795
++#: g10/card-util.c:1770
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1881 g10/keyedit.c:1872
++#: g10/card-util.c:1856 g10/keyedit.c:1258
msgid "quit this menu"
msgstr "離開這個選單"
- #: g10/card-util.c:1883
++#: g10/card-util.c:1858
msgid "show admin commands"
msgstr "顯示管理者指令"
- #: g10/card-util.c:1884 g10/keyedit.c:1875
++#: g10/card-util.c:1859 g10/keyedit.c:1261
msgid "show this help"
msgstr "顯示這份線上說明"
- #: g10/card-util.c:1886
++#: g10/card-util.c:1861
msgid "list all available data"
msgstr "列出所有可用的資料"
- #: g10/card-util.c:1889
++#: g10/card-util.c:1864
msgid "change card holder's name"
msgstr "變更卡片持有人的名字"
- #: g10/card-util.c:1890
++#: g10/card-util.c:1865
msgid "change URL to retrieve key"
msgstr "變更取回金鑰的 URL"
- #: g10/card-util.c:1891
++#: g10/card-util.c:1866
msgid "fetch the key specified in the card URL"
msgstr "從卡片 URL 取回指定的金鑰"
- #: g10/card-util.c:1892
++#: g10/card-util.c:1867
msgid "change the login name"
msgstr "變更登入名稱"
- #: g10/card-util.c:1893
++#: g10/card-util.c:1868
msgid "change the language preferences"
msgstr "變更介面語言偏好設定"
- #: g10/card-util.c:1894
++#: g10/card-util.c:1869
msgid "change card holder's sex"
msgstr "變更卡片持有者的性別"
- #: g10/card-util.c:1895
++#: g10/card-util.c:1870
msgid "change a CA fingerprint"
msgstr "變更某個憑證中心 (CA) 的指紋"
- #: g10/card-util.c:1896
++#: g10/card-util.c:1871
msgid "toggle the signature force PIN flag"
msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
- #: g10/card-util.c:1897
++#: g10/card-util.c:1872
msgid "generate new keys"
msgstr "產生新的金鑰"
- #: g10/card-util.c:1898
++#: g10/card-util.c:1873
msgid "menu to change or unblock the PIN"
msgstr "變更或重設個人識別碼 (PIN) 的選單"
- #: g10/card-util.c:1899
++#: g10/card-util.c:1874
msgid "verify the PIN and list all data"
msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
- #: g10/card-util.c:1900
++#: g10/card-util.c:1875
msgid "unblock the PIN using a Reset Code"
msgstr "用重設碼來解凍個人識別碼 (PIN)"
- #: g10/card-util.c:1901
++#: g10/card-util.c:1876
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2000
msgid "gpg/card> "
msgstr "gpg/卡片> "
- #: g10/card-util.c:2066
++#: g10/card-util.c:2041
msgid "Admin-only command\n"
msgstr "限管理者使用的指令\n"
- #: g10/card-util.c:2097
++#: g10/card-util.c:2072
msgid "Admin commands are allowed\n"
msgstr "允許使用管理者指令\n"
- #: g10/card-util.c:2099
++#: g10/card-util.c:2074
msgid "Admin commands are not allowed\n"
msgstr "未允許使用管理者指令\n"
- #: g10/card-util.c:2194 g10/keyedit.c:2826
++#: g10/card-util.c:2169 g10/keyedit.c:2212
msgid "Invalid command (try \"help\")\n"
msgstr "無效的指令 (試試看 \"help\")\n"
- #: g10/decrypt.c:190 g10/encrypt.c:958
++#: g10/decrypt.c:190 g10/encrypt.c:1023
msgid "--output doesn't work for this command\n"
msgstr "--output 在這個指令中沒有作用\n"
- #: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
++#: g10/decrypt.c:246 g10/gpg.c:4998 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: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:2167
++#: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4948 g10/keyedit.c:1441
++#: g10/keyedit.c:2318 g10/keyedit.c:2560 g10/keyedit.c:4257 g10/keylist.c:661
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2166
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "找不到金鑰 \"%s\": %s\n"
- #: 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
++#: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1924 g10/getkey.c:4407
++#: g10/gpg.c:4956 g10/keyedit.c:2291 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "讀取金鑰區塊時出錯: %s\n"
@@@ -2018,79 -1547,75 +2019,93 @@@ msgstr "公鑰 \"%s\" 有相對應的�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
- #: g10/encrypt.c:233 g10/sign.c:1304
++#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "建立密語時出錯: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:251
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "正在使用 %s 編密法\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s' 已經被壓縮了\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
++#: g10/encrypt.c:332 g10/encrypt.c:725 g10/sign.c:643
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "警告: '%s' 是個空檔案\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
msgstr "正在從 '%s' 讀取\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:708 g10/sign.c:996
++#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3863 g10/gpg.c:3903
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
+ #, fuzzy, c-format
+ #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+ msgid "cipher algorithm '%s' may not be used in %s mode\n"
+ msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
+
++#: g10/encrypt.c:661 sm/encrypt.c:489
+ #, fuzzy, c-format
+ #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+ msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
+
++#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:882
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:906
++#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已加密給: \"%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"
++#: g10/encrypt.c:998 g10/pkclist.c:1029 g10/pkclist.c:1080
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "option '%s' may not be used in %s mode\n"
msgstr "你不能夠將 %s 用於 %s 模式中\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:304
++#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 已加密的資料\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:308
++#: g10/decrypt-data.c:97 g10/mainproc.c:309
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以 %d 未知演算法所加密\n"
- #: g10/decrypt-data.c:164 sm/decrypt.c:129
++#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
- #: g10/decrypt-data.c:176
++#: g10/decrypt-data.c:188
msgid "problem handling encrypted packet\n"
msgstr "處理已加密封包有問題\n"
@@@ -2169,36 -1677,27 +2184,36 @@@ msgstr "匯出時盡可能地從金鑰�
msgid "use the GnuPG key backup format"
msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1236
msgid " - skipped"
msgstr " - 已跳過"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
- #: g10/sign.c:857 g10/sign.c:1160
++#: g10/export.c:1269 g10/import.c:1830 g10/openfile.c:200 g10/openfile.c:294
++#: g10/sign.c:889 g10/sign.c:1192
#, c-format
msgid "writing to '%s'\n"
msgstr "正在寫入 '%s'\n"
- #: g10/export.c:1708
++#: g10/export.c:1709
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
- #: g10/export.c:1903
++#: g10/export.c:1904
msgid "exporting secret keys not allowed\n"
msgstr "不允許匯出私鑰\n"
- #: g10/export.c:1980
++#: g10/export.c:1981
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
- #: g10/export.c:2067
++#: g10/export.c:2068
msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n"
- #: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2365 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"
@@@ -2267,219 -1753,172 +2282,225 @@@ msgstr "|名字|使用指定名字做�
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2802
++#: g10/getkey.c:2820
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
- #: g10/getkey.c:3637
++#: g10/getkey.c:3658
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子鑰 %s 來替換主鑰 %s\n"
- #: g10/gpg.c:430 sm/gpgsm.c:200
++#: g10/getkey.c:4336 g10/gpg.c:2063
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "選項 \"%.50s\" 的引數無效\n"
+
++#: g10/gpg.c:433 sm/gpgsm.c:201
msgid "make a signature"
msgstr "建立簽章"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "make a clear text signature"
msgstr "建立明文簽章"
- #: g10/gpg.c:433 sm/gpgsm.c:202
++#: g10/gpg.c:436 sm/gpgsm.c:203
msgid "make a detached signature"
msgstr "建立分離式簽章"
- #: g10/gpg.c:434 sm/gpgsm.c:203
++#: g10/gpg.c:437 sm/gpgsm.c:204
msgid "encrypt data"
msgstr "加密資料"
- #: g10/gpg.c:436
++#: g10/gpg.c:439
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
- #: g10/gpg.c:438 sm/gpgsm.c:205
++#: g10/gpg.c:441 sm/gpgsm.c:206
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
- #: g10/gpg.c:440 sm/gpgsm.c:206
++#: g10/gpg.c:443 sm/gpgsm.c:207
msgid "verify a signature"
msgstr "驗證簽章"
- #: g10/gpg.c:442 sm/gpgsm.c:207
++#: g10/gpg.c:445 sm/gpgsm.c:208
msgid "list keys"
msgstr "列出金鑰"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list keys and signatures"
msgstr "列出金鑰和簽章"
- #: g10/gpg.c:447
++#: g10/gpg.c:450
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
- #: g10/gpg.c:449 sm/gpgsm.c:212
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
- #: g10/gpg.c:450 sm/gpgsm.c:210
++#: g10/gpg.c:453 sm/gpgsm.c:211
msgid "list secret keys"
msgstr "列出私鑰"
- #: g10/gpg.c:452 sm/gpgsm.c:213
++#: g10/gpg.c:455 sm/gpgsm.c:214
msgid "generate a new key pair"
msgstr "產生新的金鑰對"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly generate a new key pair"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:458
++#: g10/gpg.c:461
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "full featured key pair generation"
msgstr "全能金鑰對生成"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "generate a revocation certificate"
msgstr "產生撤銷憑證"
- #: g10/gpg.c:475 sm/gpgsm.c:216
++#: g10/gpg.c:478 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "remove keys from the secret keyring"
msgstr "從私鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "quickly sign a key"
msgstr "快速簽署金鑰"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "quickly sign a key locally"
msgstr "快速在本機簽署金鑰"
- #: g10/gpg.c:482
++#: g10/gpg.c:485
msgid "sign a key"
msgstr "簽署金鑰"
- #: g10/gpg.c:483
++#: g10/gpg.c:486
msgid "sign a key locally"
msgstr "僅在本機簽署金鑰"
- #: g10/gpg.c:484
++#: g10/gpg.c:487
msgid "sign or edit a key"
msgstr "簽署或編輯金鑰"
- #: g10/gpg.c:486 sm/gpgsm.c:234
++#: g10/gpg.c:489 sm/gpgsm.c:235
msgid "change a passphrase"
msgstr "更改密語"
- #: g10/gpg.c:490
++#: g10/gpg.c:493
msgid "export keys"
msgstr "匯出金鑰"
- #: g10/gpg.c:491
++#: g10/gpg.c:494
msgid "export keys to a keyserver"
msgstr "把金鑰匯出至金鑰伺服器"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "import keys from a keyserver"
msgstr "從金鑰伺服器匯入金鑰"
- #: g10/gpg.c:495
++#: g10/gpg.c:498
msgid "search for keys on a keyserver"
msgstr "在金鑰伺服器上搜尋金鑰"
- #: g10/gpg.c:497
++#: g10/gpg.c:500
msgid "update all keys from a keyserver"
msgstr "從金鑰伺服器更新所有的金鑰"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "import/merge keys"
msgstr "匯入/合併金鑰"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "print the card status"
msgstr "列印卡片狀態"
- #: g10/gpg.c:507
++#: g10/gpg.c:510
msgid "change data on a card"
msgstr "變更卡片上的資料"
- #: g10/gpg.c:509
++#: g10/gpg.c:512
msgid "change a card's PIN"
msgstr "變更卡片的個人識別碼 (PIN)"
- #: g10/gpg.c:521
++#: g10/gpg.c:524
msgid "update the trust database"
msgstr "更新信任資料庫"
- #: g10/gpg.c:530
++#: g10/gpg.c:533
msgid "print message digests"
msgstr "印出訊息摘要"
- #: g10/gpg.c:533 sm/gpgsm.c:229
++#: g10/gpg.c:536 sm/gpgsm.c:230
msgid "run in server mode"
msgstr "以伺服器模式執行"
- #: g10/gpg.c:535
++#: g10/gpg.c:538
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:248
++#: g10/gpg.c:542 sm/gpgsm.c:249
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
- #: g10/gpg.c:542 sm/gpgsm.c:264
++#: g10/gpg.c:545 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
- #: g10/gpg.c:558 sm/gpgsm.c:300
++#: g10/gpg.c:561 sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
- #: g10/gpg.c:564
++#: g10/gpg.c:567
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
- #: g10/gpg.c:571
++#: g10/gpg.c:574
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
- #: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:591 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至指定檔案"
- #: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:606 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "不要做任何改變"
- #: g10/gpg.c:604
++#: g10/gpg.c:607
msgid "prompt before overwriting"
msgstr "覆寫前先詢問"
- #: g10/gpg.c:653
++#: g10/gpg.c:657
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
- #: g10/gpg.c:679 sm/gpgsm.c:357
++#: g10/gpg.c:683 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2487,7 -1926,6 +2508,7 @@@ msgstr "
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:682
++#: g10/gpg.c:686
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2517,11 -1955,9 +2538,11 @@@ msgstr "
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1057
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
- #: g10/gpg.c:1055
++#: g10/gpg.c:1060
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2531,7 -1967,6 +2552,7 @@@ msgstr "
"簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:1066 sm/gpgsm.c:580
++#: g10/gpg.c:1071 sm/gpgsm.c:581
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2539,531 -1974,402 +2560,515 @@@ msgstr "
"\n"
"已支援的演算法:\n"
- #: g10/gpg.c:1069
++#: g10/gpg.c:1074
msgid "Pubkey: "
msgstr "公鑰: "
- #: g10/gpg.c:1076 g10/keyedit.c:3566
++#: g10/gpg.c:1081 g10/keyedit.c:3027
msgid "Cipher: "
msgstr "編密法: "
- #: g10/gpg.c:1083
++#: g10/gpg.c:1088
msgid "Hash: "
msgstr "雜湊: "
- #: g10/gpg.c:1090 g10/keyedit.c:3615
++#: g10/gpg.c:1095 g10/keyedit.c:3076
msgid "Compression: "
msgstr "壓縮: "
- #: g10/gpg.c:1159 sm/gpgsm.c:654
++#: g10/gpg.c:1164 sm/gpgsm.c:655
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法: %s [選項] %s\n"
- #: g10/gpg.c:1347 sm/gpgsm.c:743
++#: g10/gpg.c:1352 sm/gpgsm.c:744
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
- #: g10/gpg.c:1365
++#: g10/gpg.c:1370
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1569
++#: g10/gpg.c:1574
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1580
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1581
++#: g10/gpg.c:1586
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1592
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1595
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1593
++#: g10/gpg.c:1598
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1604
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1607
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1605
++#: g10/gpg.c:1610
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1821
++#: g10/gpg.c:1826
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "未知的組態項目 '%s'\n"
- #: g10/gpg.c:1932
++#: g10/gpg.c:1937
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
- #: g10/gpg.c:1934
++#: g10/gpg.c:1939
msgid "show key usage information during key listings"
msgstr "列出金鑰時顯示金鑰用途資訊"
- #: g10/gpg.c:1936
++#: g10/gpg.c:1941
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
- #: g10/gpg.c:1938
++#: g10/gpg.c:1943
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
- #: g10/gpg.c:1940
++#: g10/gpg.c:1945
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:1944
++#: g10/gpg.c:1949
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
- #: g10/gpg.c:1946
++#: g10/gpg.c:1951
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:1948
++#: g10/gpg.c:1953
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
- #: g10/gpg.c:1950
++#: g10/gpg.c:1955
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:1952
++#: g10/gpg.c:1957
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
- #: g10/gpg.c:1954
++#: g10/gpg.c:1959
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
- #: g10/gpg.c:1956
++#: g10/gpg.c:1961
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
- #: 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:2069
++#: g10/gpg.c:2074
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/gpg.c:2071 g10/gpg.c:2107
++#: g10/gpg.c:2076
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: 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:2244
++#: g10/gpg.c:2227
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
- #: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
++#: g10/gpg.c:2840 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不採用 %s!\n"
- #: g10/gpg.c:3021 g10/gpg.c:3033
++#: g10/gpg.c:3020 g10/gpg.c:3032
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' 不是有效的簽章使用期限\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3054
#, 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:3087 sm/gpgsm.c:1158
++#: g10/gpg.c:3086 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無效的個人識別碼項目模式 '%s'\n"
- #: g10/gpg.c:3142
++#: g10/gpg.c:3141
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' 不是有效的字元集\n"
- #: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
++#: g10/gpg.c:3163 g10/gpg.c:3368 g10/keyedit.c:4993
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3181
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3185
++#: g10/gpg.c:3184
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
- #: g10/gpg.c:3195
++#: g10/gpg.c:3194
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
- #: g10/gpg.c:3201 g10/gpg.c:3216
++#: g10/gpg.c:3200 g10/gpg.c:3215
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3206
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
- #: g10/gpg.c:3210
++#: g10/gpg.c:3209
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3221
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
- #: g10/gpg.c:3225
++#: g10/gpg.c:3224
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3233
++#: g10/gpg.c:3232
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
- #: g10/gpg.c:3235
++#: g10/gpg.c:3234
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
- #: g10/gpg.c:3237
++#: g10/gpg.c:3236
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
- #: g10/gpg.c:3239
++#: g10/gpg.c:3238
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3242
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
- #: g10/gpg.c:3245
++#: g10/gpg.c:3244
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:3247
++#: g10/gpg.c:3246
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
- #: g10/gpg.c:3249
++#: g10/gpg.c:3248
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:3251
++#: g10/gpg.c:3250
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
- #: g10/gpg.c:3253
++#: g10/gpg.c:3252
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
- #: g10/gpg.c:3255
++#: g10/gpg.c:3254
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3264
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
- #: g10/gpg.c:3272
++#: g10/gpg.c:3271
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3463
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3466
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3614 sm/gpgsm.c:1501
++#: g10/gpg.c:3619 sm/gpgsm.c:1517
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3657 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
- #: g10/gpg.c:3673
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1601
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
- #: 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:3720
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
- #: g10/gpg.c:3726
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
- #: g10/gpg.c:3745
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
- #: g10/gpg.c:3747
++#: g10/gpg.c:3752
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:3749
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
- #: g10/gpg.c:3756
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
- #: g10/gpg.c:3763
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
- #: g10/gpg.c:3767
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
- #: g10/gpg.c:3771
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
- #: g10/gpg.c:3775
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
- #: g10/gpg.c:3811
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
- #: 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:3863
- #, c-format
- msgid "you may not use digest algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3869 g10/gpg.c:3915 g10/sig-check.c:139 g10/sign.c:284
++#: sm/gpgsm.c:1641 sm/gpgsm.c:1651 sm/sign.c:478 sm/verify.c:473
+ #, fuzzy, c-format
+ #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
+ msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
- #: g10/gpg.c:3868
- #, c-format
- msgid "you may not use compression algorithm '%s' while in %s mode\n"
++#: g10/gpg.c:3875
+ #, fuzzy, c-format
+ #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ msgid "compression algorithm '%s' may not be used in %s mode\n"
msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
- #: g10/gpg.c:3972
++#: g10/gpg.c:4015
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
- #: g10/gpg.c:3984
++#: g10/gpg.c:4027
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
- #: g10/gpg.c:4056
++#: g10/gpg.c:4099
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s' 對稱式加密失敗: %s\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4128
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:4088
- #, c-format
- msgid "you cannot use --symmetric --encrypt while in %s mode\n"
++#: g10/gpg.c:4131
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --encrypt in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4189
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4148
- #, c-format
- msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
++#: g10/gpg.c:4192
+ #, fuzzy, c-format
+ #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4503 g10/keyserver.c:1839
++#: g10/gpg.c:4549 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
- #: g10/gpg.c:4508
++#: g10/gpg.c:4554
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
- #: g10/gpg.c:4514
++#: g10/gpg.c:4560
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4527
++#: g10/gpg.c:4573
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4539
++#: g10/gpg.c:4585
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
- #: g10/gpg.c:4552
++#: g10/gpg.c:4598
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
- #: g10/gpg.c:4619
++#: g10/gpg.c:4665
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
- #: g10/gpg.c:4630
++#: g10/gpg.c:4676
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
- #: g10/gpg.c:4722
++#: g10/gpg.c:4768
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無效的雜湊演算法 '%s'\n"
- #: g10/gpg.c:4871 g10/tofu.c:2155
++#: g10/gpg.c:4917 g10/tofu.c:2154
#, 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:4883
++#: g10/gpg.c:4929
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4931
++#: g10/gpg.c:4977
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4988
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
- #: g10/gpg.c:5281
++#: g10/gpg.c:5327
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
- #: g10/gpg.c:5283
++#: g10/gpg.c:5329
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
- #: g10/gpg.c:5316
++#: g10/gpg.c:5362
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@@ -3075,7 -2379,6 +3080,7 @@@ msgstr "|檔案|從指定鑰匙圈檔�
msgid "make timestamp conflicts only a warning"
msgstr "僅把時間戳印矛盾視為警告"
- #: g10/gpgv.c:84 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:348
msgid "|FD|write status info to this FD"
msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
@@@ -3104,331 -2402,269 +3109,337 @@@ msgstr "沒有可用的說明
msgid "No help available for '%s'"
msgstr "'%s' 沒有可用的說明"
- #: g10/import.c:152
++#: g10/import.c:160
msgid "import signatures that are marked as local-only"
msgstr "匯入標記為僅限本機使用的簽章"
- #: g10/import.c:155
++#: g10/import.c:163
msgid "repair damage from the pks keyserver during import"
msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
- #: g10/import.c:158
++#: g10/import.c:166
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:161
++#: g10/import.c:169
msgid "do not update the trustdb after import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:164
++#: g10/import.c:172
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "顯示金鑰指紋"
- #: g10/import.c:167
++#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "祇接受既有金鑰的更新"
- #: g10/import.c:170
++#: g10/import.c:178
msgid "remove unusable parts from key after import"
msgstr "匯入後從金鑰中移除無法使用的部分"
- #: g10/import.c:173
++#: g10/import.c:181
msgid "remove as much as possible from key after import"
msgstr "匯入後盡可能地從金鑰中移除"
- #: g10/import.c:176
++#: g10/import.c:184
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:179
++#: g10/import.c:187
#, fuzzy
#| msgid "assume input is in binary format"
msgid "assume the GnuPG key backup format"
msgstr "假設輸入的是二進制格式"
- #: g10/import.c:341 g10/import.c:584
++#: g10/import.c:191
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "repair keys on import"
+ msgstr "顯示金鑰指紋"
+
++#: g10/import.c:352 g10/import.c:590
#, c-format
msgid "skipping block of type %d\n"
msgstr "正在跳過 %d 型態的區塊\n"
- #: g10/import.c:601
++#: g10/import.c:607
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已處理 %lu 把金鑰\n"
- #: g10/import.c:671
++#: g10/import.c:677
#, c-format
msgid "Total number processed: %lu\n"
msgstr "處理總量: %lu\n"
- #: g10/import.c:674
++#: g10/import.c:680
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:676
++#: g10/import.c:682
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:679
++#: g10/import.c:685
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 沒有使用者的 ID: %lu\n"
- #: g10/import.c:682 sm/import.c:130
++#: g10/import.c:688 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已匯入: %lu"
- #: g10/import.c:686 sm/import.c:134
++#: g10/import.c:692 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改變的: %lu\n"
- #: g10/import.c:688
++#: g10/import.c:694
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新的使用者 ID: %lu\n"
- #: g10/import.c:690
++#: g10/import.c:696
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子鑰: %lu\n"
- #: g10/import.c:692
++#: g10/import.c:698
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的簽章: %lu\n"
- #: g10/import.c:694
++#: g10/import.c:700
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的金鑰撤銷: %lu\n"
- #: g10/import.c:696 sm/import.c:136
++#: g10/import.c:702 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 已讀取的私鑰: %lu\n"
- #: g10/import.c:698 sm/import.c:138
++#: g10/import.c:704 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 已匯入的私鑰: %lu\n"
- #: g10/import.c:700 sm/import.c:140
++#: g10/import.c:706 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改變的私鑰: %lu\n"
- #: g10/import.c:702 sm/import.c:142
++#: g10/import.c:708 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被匯入: %lu\n"
- #: g10/import.c:704
++#: g10/import.c:710
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 已清除的簽章: %lu\n"
- #: g10/import.c:706
++#: g10/import.c:712
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 已清除的使用者 ID: %lu\n"
- #: g10/import.c:1059
++#: g10/import.c:1065
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
- #: g10/import.c:1101
++#: g10/import.c:1107
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
- #: g10/import.c:1116
++#: g10/import.c:1122
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
- #: g10/import.c:1128
++#: g10/import.c:1134
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
- #: g10/import.c:1141
++#: g10/import.c:1147
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "我們強烈建議你更新偏好設定, 並重新\n"
- #: g10/import.c:1143
++#: g10/import.c:1149
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
- #: g10/import.c:1168
++#: g10/import.c:1174
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1443 g10/import.c:2233
++#: g10/import.c:1661 g10/import.c:2494
#, c-format
msgid "key %s: no user ID\n"
msgstr "金鑰 %s: 沒有使用者 ID\n"
- #: g10/import.c:1449
++#: g10/import.c:1667
#, c-format
msgid "key %s: %s\n"
msgstr "金鑰 %s: %s\n"
- #: g10/import.c:1450 g10/import.c:2207
++#: g10/import.c:1668 g10/import.c:2468
msgid "rejected by import screener"
msgstr "遭到匯入篩選程式駁回"
- #: g10/import.c:1482
++#: g10/import.c:1700
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
- #: g10/import.c:1500
++#: g10/import.c:1721
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
- #: g10/import.c:1510 g10/import.c:1541
++#: g10/import.c:1731 g10/import.c:1762
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
- #: g10/import.c:1512
++#: g10/import.c:1733
msgid "this may be caused by a missing self-signature\n"
msgstr "這可能肇因於遺失自我簽章所致\n"
- #: g10/import.c:1582 g10/import.c:2384
++#: g10/import.c:1803 g10/import.c:2645
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "金鑰 %s: 找不到公鑰: %s\n"
- #: g10/import.c:1588
++#: g10/import.c:1809
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
- #: g10/import.c:1603
++#: g10/import.c:1825
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可寫入的鑰匙圈: %s\n"
- #: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
++#: g10/import.c:1852 g10/import.c:1970 g10/import.c:2711
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/import.c:1632
++#: g10/import.c:1872
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
- #: g10/import.c:1656
++#: g10/import.c:1897
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "金鑰 %s: 跟我們的副本不吻合\n"
- #: g10/import.c:1672 g10/import.c:2408
++#: g10/import.c:1913 g10/import.c:2669
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
- #: g10/import.c:1680 g10/import.c:2415
++#: g10/import.c:1921 g10/import.c:2676
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
- #: g10/import.c:1723
++#: g10/import.c:1980
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
- #: g10/import.c:1726
++#: g10/import.c:1983
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
- #: g10/import.c:1729
++#: g10/import.c:1986
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
- #: g10/import.c:1732
++#: g10/import.c:1989
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
- #: g10/import.c:1735
++#: g10/import.c:1992
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
- #: g10/import.c:1738
++#: g10/import.c:1995
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
- #: g10/import.c:1741
++#: g10/import.c:1998
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1744
++#: g10/import.c:2001
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1747
++#: g10/import.c:2004
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1750
++#: g10/import.c:2007
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1773
++#: g10/import.c:2033
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "金鑰 %s: \"%s\" 未改變\n"
- #: g10/import.c:2085 g10/import.c:2330
++#: g10/import.c:2346 g10/import.c:2591
#, c-format
msgid "key %s: secret key imported\n"
msgstr "金鑰 %s: 私鑰已匯入\n"
- #: g10/import.c:2093
++#: g10/import.c:2354
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "金鑰 %s: 私鑰已存在\n"
- #: g10/import.c:2101
++#: g10/import.c:2362
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
- #: g10/import.c:2206
++#: g10/import.c:2467
#, c-format
msgid "secret key %s: %s\n"
msgstr "私鑰 %s: %s\n"
- #: g10/import.c:2226 g10/import.c:2261
++#: g10/import.c:2487 g10/import.c:2522
msgid "importing secret keys not allowed\n"
msgstr "未允許匯入私鑰\n"
- #: g10/import.c:2250
++#: g10/import.c:2511
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
@@@ -3443,87 -2679,70 +3454,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2322
++#: g10/import.c:2583
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2377
++#: g10/import.c:2638
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
- #: g10/import.c:2426
++#: g10/import.c:2687
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
- #: g10/import.c:2459
++#: g10/import.c:2720
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
- #: g10/import.c:2535
++#: g10/import.c:2796
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
- #: g10/import.c:2552
++#: g10/import.c:2813
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
- #: g10/import.c:2554
++#: g10/import.c:2815
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
- #: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
++#: g10/import.c:2832 g10/import.c:2858 g10/import.c:2909
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "金鑰 %s: 未支援的公鑰演算法\n"
- #: g10/import.c:2572
++#: g10/import.c:2833
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
- #: g10/import.c:2586
++#: g10/import.c:2847
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
- #: g10/import.c:2599
++#: g10/import.c:2860
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "金鑰 %s: 無效的附帶子鑰\n"
- #: g10/import.c:2615
++#: g10/import.c:2876
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
- #: g10/import.c:2637
++#: g10/import.c:2898
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
- #: g10/import.c:2650
++#: g10/import.c:2911
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "金鑰 %s: 無效的子鑰撤銷\n"
- #: g10/import.c:2665
++#: g10/import.c:2926
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
- #: g10/import.c:2708
++#: g10/import.c:2969
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
- #: g10/import.c:2732
++#: g10/import.c:2993
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "金鑰 %s: 子鑰已跳過\n"
@@@ -3532,52 -2751,42 +3543,52 @@@
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
- #: g10/import.c:2761
++#: g10/import.c:3022
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
- #: g10/import.c:2772
++#: g10/import.c:3033
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2790
++#: g10/import.c:3051
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
- #: g10/import.c:2804
++#: g10/import.c:3065
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2812
++#: g10/import.c:3073
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
- #: g10/import.c:2954
++#: g10/import.c:3215
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
- #: g10/import.c:3018
++#: g10/import.c:3279
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
- #: g10/import.c:3034
++#: g10/import.c:3295
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
- #: g10/import.c:3098
++#: g10/import.c:3361
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
- #: g10/import.c:3136
++#: g10/import.c:3399
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
@@@ -3618,81 -2820,12 +3629,15 @@@ msgstr "開啟 '%s' 時出錯: %s\n
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立鑰匙圈快取失敗: %s\n"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[撤銷]"
- #: g10/keyedit.c:268
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[自我簽章]"
- #: 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"
-
- #: g10/keyedit.c:633
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
- msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "金鑰 %s: 未支援的公鑰演算法\n"
-
- #: g10/keyedit.c:642
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
- msgid ""
- "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "卡片不支援 %s 摘要演算法\n"
-
- #: g10/keyedit.c:805
- #, fuzzy
- #| msgid "Good signature from"
- msgid " (reordered signatures follow)"
- msgstr "完好的簽章來自於"
-
- #: g10/keyedit.c:918
- #, fuzzy, c-format
- #| msgid "key %s: %s\n"
- msgid "key %s:\n"
- msgstr "金鑰 %s: %s\n"
-
- #: g10/keyedit.c:921
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
- msgid "%d duplicate signature removed\n"
- msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
-
- #: g10/keyedit.c:924 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
- msgid "%d signature not checked due to a missing key\n"
- msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
-
- #: g10/keyedit.c:928 g10/keylist.c:477
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d 份損壞的簽章\n"
-
- #: g10/keyedit.c:932
- #, fuzzy, c-format
- #| msgid "Good signature from"
- msgid "%d signature reordered\n"
- msgid_plural "%d signatures reordered\n"
- msgstr[0] "完好的簽章來自於"
-
- #: g10/keyedit.c:937
- #, c-format
- msgid ""
- "Warning: errors found and only checked self-signatures, run '%s' to check "
- "all signatures.\n"
- msgstr ""
-
- #: g10/keyedit.c:997 g10/pkclist.c:274
++#: g10/keyedit.c:383 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3702,17 -2835,14 +3647,17 @@@ msgstr "
"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
"(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
- #: g10/keyedit.c:1001 g10/pkclist.c:286
++#: g10/keyedit.c:387 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉強信任\n"
- #: g10/keyedit.c:1002 g10/pkclist.c:288
++#: g10/keyedit.c:388 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全信任\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:406
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3722,50 -2852,38 +3667,50 @@@ msgstr "
"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
"同時也信任這把金鑰所簽署的信任簽章.\n"
- #: g10/keyedit.c:1037
++#: g10/keyedit.c:423
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
- #: g10/keyedit.c:1165
++#: g10/keyedit.c:551
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1173
++#: g10/keyedit.c:559
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "使用者 ID \"%s\" 已撤銷."
- #: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
- #: g10/keyedit.c:2253
++#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
++#: g10/keyedit.c:1639
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "你仍然想要簽署它嗎? (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
++#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
++#: g10/keyedit.c:1644 g10/keyedit.c:2647
msgid " Unable to sign.\n"
msgstr " 無法簽署.\n"
- #: g10/keyedit.c:1201
++#: g10/keyedit.c:587
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "使用者 ID \"%s\" 已過期."
- #: g10/keyedit.c:1229
++#: g10/keyedit.c:615
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "使用者 ID \"%s\" 未經自我簽署."
- #: g10/keyedit.c:1258
++#: g10/keyedit.c:644
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "使用者 ID \"%s\" 可被簽署."
- #: g10/keyedit.c:1260
++#: g10/keyedit.c:646
msgid "Sign it? (y/N) "
msgstr "是否要簽署? (y/N) "
- #: g10/keyedit.c:1287
++#: g10/keyedit.c:673
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3774,11 -2892,9 +3719,11 @@@ msgstr "
"\"%s\" 裡的自我簽章\n"
"是 PGP 2.x 型態的簽章.\n"
- #: g10/keyedit.c:1296
++#: g10/keyedit.c:682
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:695
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3787,11 -2903,9 +3732,11 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"已經過期了.\n"
- #: g10/keyedit.c:1314
++#: g10/keyedit.c:700
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:721
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3800,43 -2914,34 +3745,43 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"是一份本機簽章.\n"
- #: g10/keyedit.c:1340
++#: g10/keyedit.c:726
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
- #: g10/keyedit.c:1360
++#: g10/keyedit.c:746
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
- #: g10/keyedit.c:1369
++#: g10/keyedit.c:755
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "你仍然想要再次簽署它嗎? (y/N) "
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:777
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "沒有東西可以讓金鑰 %s 簽署\n"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:801
msgid "This key has expired!"
msgstr "這把金鑰已經過期了!"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:819
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "這把金鑰將在 %s 過期.\n"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:825
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:866
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3845,31 -2950,25 +3790,31 @@@ msgstr "
"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
- #: g10/keyedit.c:1485
++#: g10/keyedit.c:871
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答.%s\n"
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:873
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本沒有檢查過.%s\n"
- #: g10/keyedit.c:1489
++#: g10/keyedit.c:875
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我隨意檢查過了.%s\n"
- #: g10/keyedit.c:1492
++#: g10/keyedit.c:878
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地檢查過了.%s\n"
- #: g10/keyedit.c:1499
++#: g10/keyedit.c:885
msgid "Your selection? (enter '?' for more information): "
msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
- #: g10/keyedit.c:1526
++#: g10/keyedit.c:912
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3878,220 -2977,166 +3823,220 @@@ msgstr "
"你真的確定要用你的金鑰 \"%s\" (%s)\n"
"來簽署這把金鑰嗎\n"
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:920
msgid "This will be a self-signature.\n"
msgstr "這將會是一份自我簽章.\n"
- #: g10/keyedit.c:1539
++#: g10/keyedit.c:925
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
- #: g10/keyedit.c:1546
++#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:942
msgid "The signature will be marked as non-exportable.\n"
msgstr "這份簽章會被標記成不可匯出.\n"
- #: g10/keyedit.c:1563
++#: g10/keyedit.c:949
msgid "The signature will be marked as non-revocable.\n"
msgstr "這份簽章會被標記成不可撤銷.\n"
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:956
msgid "I have not checked this key at all.\n"
msgstr "我根本沒有檢查過這把金鑰.\n"
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:961
msgid "I have checked this key casually.\n"
msgstr "我隨意檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1580
++#: g10/keyedit.c:966
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1592
++#: g10/keyedit.c:978
msgid "Really sign? (y/N) "
msgstr "真的要簽署嗎? (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
++#: g10/keyedit.c:1029 g10/keyedit.c:5866 g10/keyedit.c:5949 g10/keyedit.c:6078
++#: g10/keyedit.c:6140 g10/sign.c:357
#, c-format
msgid "signing failed: %s\n"
msgstr "簽署時失敗: %s\n"
- #: g10/keyedit.c:1730
++#: g10/keyedit.c:1116
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1146
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "金鑰 %s: 變更密語時出錯: %s\n"
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1260
msgid "save and quit"
msgstr "儲存並離開"
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1263
msgid "show key fingerprint"
msgstr "顯示金鑰指紋"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1264
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "請輸入金鑰鑰柄: "
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1265
msgid "list key and user IDs"
msgstr "列出金鑰和使用者 ID"
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1267
msgid "select user ID N"
msgstr "選擇使用者 ID N"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1268
msgid "select subkey N"
msgstr "選擇子鑰 N"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1269
msgid "check signatures"
msgstr "檢查簽章"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1275
msgid "sign selected user IDs [* see below for related commands]"
msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1280
msgid "sign selected user IDs locally"
msgstr "僅在本機簽署所選的使用者 ID"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1281
msgid "sign selected user IDs with a trust signature"
msgstr "用信任簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1283
msgid "sign selected user IDs with a non-revocable signature"
msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1285
msgid "add a user ID"
msgstr "增加使用者 ID"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1287
msgid "add a photo ID"
msgstr "增加照片 ID"
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1288
msgid "delete selected user IDs"
msgstr "刪除所選的使用者 ID"
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1291
msgid "add a subkey"
msgstr "增加子鑰"
- #: g10/keyedit.c:1908
++#: g10/keyedit.c:1294
msgid "add a key to a smartcard"
msgstr "將金鑰加到智慧卡"
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1296
msgid "move a key to a smartcard"
msgstr "將金鑰移動到智慧卡"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1298
msgid "move a backup key to a smartcard"
msgstr "將備份金鑰移動到智慧卡"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1300
msgid "delete selected subkeys"
msgstr "刪除所選的子鑰"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1302
msgid "add a revocation key"
msgstr "增加撤銷金鑰"
- #: g10/keyedit.c:1918
++#: g10/keyedit.c:1304
msgid "delete signatures from the selected user IDs"
msgstr "從所選的使用者 ID 中刪除簽章"
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1306
msgid "change the expiration date for the key or selected subkeys"
msgstr "變更金鑰或所選子鑰的使用期限"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1308
msgid "flag the selected user ID as primary"
msgstr "把所選的使用者 ID 標為主要"
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1311
msgid "list preferences (expert)"
msgstr "列出偏好 (專家模式)"
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1312
msgid "list preferences (verbose)"
msgstr "列出偏好 (囉唆模式)"
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1314
msgid "set preference list for the selected user IDs"
msgstr "設定所選使用者 ID 的偏好清單"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1317
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1319
msgid "set a notation for the selected user IDs"
msgstr "為所選的使用者 ID 設定註記"
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1321
msgid "change the passphrase"
msgstr "更改密語"
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1324
msgid "change the ownertrust"
msgstr "更改主觀信任"
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1327
msgid "revoke signatures on the selected user IDs"
msgstr "撤銷所選使用者 ID 的簽章"
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1329
msgid "revoke selected user IDs"
msgstr "撤銷所選的使用者 ID"
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1332
msgid "revoke key or selected subkeys"
msgstr "撤銷金鑰或所選的子鑰"
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1334
msgid "enable key"
msgstr "啟用金鑰"
- #: g10/keyedit.c:1949
++#: g10/keyedit.c:1335
msgid "disable key"
msgstr "停用金鑰"
- #: g10/keyedit.c:1951
++#: g10/keyedit.c:1337
msgid "show selected photo IDs"
msgstr "顯示所選的照片 ID"
- #: g10/keyedit.c:1953
++#: g10/keyedit.c:1339
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
- #: g10/keyedit.c:1955
++#: g10/keyedit.c:1341
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
- #: g10/keyedit.c:2067
++#: g10/keyedit.c:1453
msgid "Secret key is available.\n"
msgstr "私鑰可用.\n"
- #: g10/keyedit.c:2167
++#: g10/keyedit.c:1553
msgid "Need the secret key to do this.\n"
msgstr "要有私鑰纔能這麼做.\n"
- #: g10/keyedit.c:2188
++#: g10/keyedit.c:1574
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4102,278 -3147,226 +4047,290 @@@ msgstr "
" 加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
" (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
- #: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
++#: g10/keyedit.c:1632 g10/keyedit.c:2647 g10/keyedit.c:2786 g10/keyedit.c:2854
msgid "Key is revoked."
msgstr "金鑰已撤銷."
- #: g10/keyedit.c:2269
++#: g10/keyedit.c:1655
msgid "Really sign all user IDs? (y/N) "
msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2273
++#: g10/keyedit.c:1659
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2281
++#: g10/keyedit.c:1667
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示: 選擇使用者 ID 來加以簽署\n"
- #: g10/keyedit.c:2292
++#: g10/keyedit.c:1678
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "未知的簽章種類 '%s'\n"
- #: g10/keyedit.c:2316
++#: g10/keyedit.c:1702
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允許使用這個指令.\n"
- #: g10/keyedit.c:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
++#: g10/keyedit.c:1724 g10/keyedit.c:1748 g10/keyedit.c:1945
msgid "You must select at least one user ID.\n"
msgstr "你至少得選擇一個使用者 ID.\n"
- #: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
++#: g10/keyedit.c:1726 g10/keyedit.c:1750 g10/keyedit.c:1907 g10/keyedit.c:1947
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2343
++#: g10/keyedit.c:1729
msgid "You can't delete the last user ID!\n"
msgstr "你不能刪除最後一個使用者 ID!\n"
- #: g10/keyedit.c:2346
++#: g10/keyedit.c:1732
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2347
++#: g10/keyedit.c:1733
msgid "Really remove this user ID? (y/N) "
msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2404
++#: g10/keyedit.c:1790
msgid "Really move the primary key? (y/N) "
msgstr "真的要移動主鑰嗎? (y/N) "
- #: g10/keyedit.c:2416 g10/keyedit.c:5050
++#: g10/keyedit.c:1802 g10/keyedit.c:4517
msgid "You must select exactly one key.\n"
msgstr "你一定祇得選擇一把金鑰.\n"
- #: g10/keyedit.c:2444
++#: g10/keyedit.c:1830
msgid "Command expects a filename argument\n"
msgstr "這項指令要拿一個檔名來當作引數\n"
- #: g10/keyedit.c:2465
++#: g10/keyedit.c:1851
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
- #: g10/keyedit.c:2484
++#: g10/keyedit.c:1870
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
- #: g10/keyedit.c:2519
++#: g10/keyedit.c:1905
msgid "You must select at least one key.\n"
msgstr "你至少得選擇一把金鑰.\n"
- #: g10/keyedit.c:2525
++#: g10/keyedit.c:1911
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
- #: g10/keyedit.c:2527
++#: g10/keyedit.c:1913
msgid "Do you really want to delete this key? (y/N) "
msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2565
++#: g10/keyedit.c:1951
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2566
++#: g10/keyedit.c:1952
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2584
++#: g10/keyedit.c:1970
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2595
++#: g10/keyedit.c:1981
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
- #: g10/keyedit.c:2597
++#: g10/keyedit.c:1983
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
- #: g10/keyedit.c:2655
++#: g10/keyedit.c:2041
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
- #: g10/keyedit.c:2700
++#: g10/keyedit.c:2086
msgid "Set preference list to:\n"
msgstr "設定偏好清單至:\n"
- #: g10/keyedit.c:2707
++#: g10/keyedit.c:2093
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2709
++#: g10/keyedit.c:2095
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2783
++#: g10/keyedit.c:2169
msgid "Save changes? (y/N) "
msgstr "要儲存變更嗎? (y/N) "
- #: g10/keyedit.c:2787
++#: g10/keyedit.c:2173
msgid "Quit without saving? (y/N) "
msgstr "要不儲存就離開嗎? (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
++#: g10/keyedit.c:2184 g10/keyedit.c:2194 g10/keyedit.c:2371 g10/keyedit.c:2445
++#: g10/keyedit.c:2513 g10/keyedit.c:2737 g10/keyedit.c:2802 g10/keyedit.c:2953
#, c-format
msgid "update failed: %s\n"
msgstr "更新失敗: %s\n"
- #: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
++#: g10/keyedit.c:2200 g10/keyedit.c:2742 g10/keyedit.c:2807 g10/keyedit.c:2960
msgid "Key not changed so no update needed.\n"
msgstr "金鑰沒有變更所以不需要更新.\n"
- #: g10/keyedit.c:3046
++#: g10/keyedit.c:2432
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
msgstr "你不能刪除最後一個使用者 ID!\n"
- #: g10/keyedit.c:3072
++#: g10/keyedit.c:2458
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "revoking the user ID failed: %s\n"
msgstr "檢查信任清單時失敗: %s\n"
- #: g10/keyedit.c:3136
++#: g10/keyedit.c:2522
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "setting the primary user ID failed: %s\n"
msgstr "檢查信任清單時失敗: %s\n"
- #: g10/keyedit.c:3167
++#: g10/keyedit.c:2553
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" 不是指紋\n"
- #: g10/keyedit.c:3196
++#: g10/keyedit.c:2582
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" 不是主要指紋\n"
- #: g10/keyedit.c:3332 g10/keyedit.c:3335
++#: g10/keyedit.c:2718 g10/keyedit.c:2721
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "無效的數值\n"
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "No matching user IDs."
msgstr "沒有相符的使用者 ID."
- #: g10/keyedit.c:3338
++#: g10/keyedit.c:2724
msgid "Nothing to sign.\n"
msgstr "沒有東西可以簽署.\n"
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:2862
#, fuzzy, c-format
#| msgid "'%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid expiration time\n"
msgstr "'%s' 不是有效的簽章使用期限\n"
- #: g10/keyedit.c:3591
++#: g10/keyedit.c:2905
+ #, fuzzy, c-format
+ #| msgid "\"%s\" is not a fingerprint\n"
+ msgid "\"%s\" is not a proper fingerprint\n"
+ msgstr "\"%s\" 不是指紋\n"
+
++#: g10/keyedit.c:2929
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "subkey \"%s\" not found\n"
+ msgstr "找不到金鑰 \"%s\": %s\n"
+
++#: g10/keyedit.c:3052
msgid "Digest: "
msgstr "摘要: "
- #: g10/keyedit.c:3648
++#: g10/keyedit.c:3109
msgid "Features: "
msgstr "特點: "
- #: g10/keyedit.c:3659
++#: g10/keyedit.c:3120
msgid "Keyserver no-modify"
msgstr "金鑰伺服器無修改"
- #: g10/keyedit.c:3674 g10/keylist.c:374
++#: g10/keyedit.c:3135 g10/keylist.c:375
msgid "Preferred keyserver: "
msgstr "偏好的金鑰伺服器: "
- #: g10/keyedit.c:3682 g10/keyedit.c:3683
++#: g10/keyedit.c:3143 g10/keyedit.c:3144
msgid "Notations: "
msgstr "註記: "
- #: g10/keyedit.c:3928
++#: g10/keyedit.c:3389
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:3461
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
- #: g10/keyedit.c:4024
++#: g10/keyedit.c:3485
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
- #: g10/keyedit.c:4030
++#: g10/keyedit.c:3491
msgid "(sensitive)"
msgstr "(機密)"
- #: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3533 g10/keyedit.c:3675 g10/keylist.c:263 g10/keyserver.c:538
#, c-format
msgid "created: %s"
msgstr "建立: %s"
- #: g10/keyedit.c:4075 g10/keylist.c:1888
++#: g10/keyedit.c:3536 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
msgstr "撤銷: %s"
# of subkey
- #: g10/keyedit.c:4077 g10/keylist.c:1894
++#: g10/keyedit.c:3538 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "過期: %s"
# of subkey
- #: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
++#: g10/keyedit.c:3540 g10/keyedit.c:3677 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
#, c-format
msgid "expires: %s"
msgstr "到期: %s"
- #: g10/keyedit.c:4081
++#: g10/keyedit.c:3542
#, c-format
msgid "usage: %s"
msgstr "用途: %s"
- #: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
++#: g10/keyedit.c:3550 g10/keyedit.c:3570 g10/keylist.c:268
msgid "card-no: "
msgstr "卡片編號: "
- #: g10/keyedit.c:4148
++#: g10/keyedit.c:3609
#, c-format
msgid "trust: %s"
msgstr "信任: %s"
- #: g10/keyedit.c:4152
++#: g10/keyedit.c:3613
#, c-format
msgid "validity: %s"
msgstr "有效性: %s"
- #: g10/keyedit.c:4159
++#: g10/keyedit.c:3620
msgid "This key has been disabled"
msgstr "這把金鑰已經停用了"
- #: g10/keyedit.c:4177
++#: g10/keyedit.c:3638
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4381,18 -3374,12 +4338,18 @@@ msgstr "
"請注意顯示出來的金鑰有效性不需要更正,\n"
"除非你重新執行程式.\n"
- #: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
++#: g10/keyedit.c:3694 g10/keyedit.c:4125 g10/keyserver.c:548
++#: g10/mainproc.c:2109 g10/tofu.c:1787 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:1793 g10/trust.c:104 g10/trust.c:729
++#: g10/keyedit.c:3696 g10/keyedit.c:4127 g10/keyserver.c:552
++#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "已過期"
- #: g10/keyedit.c:4352
++#: g10/keyedit.c:3813
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4400,15 -3387,12 +4357,15 @@@ msgstr "
"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
" 導致不同的使用者 ID 被當成主要 ID.\n"
- #: g10/keyedit.c:4404
++#: g10/keyedit.c:3865
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "警告: 你的加密子鑰很快將到期.\n"
- #: g10/keyedit.c:4405
++#: g10/keyedit.c:3866
msgid "You may want to change its expiration date too.\n"
msgstr "你可能也會想變更其使用期限.\n"
- #: g10/keyedit.c:4464
++#: g10/keyedit.c:3925
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4417,72 -3401,57 +4374,72 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4469 g10/keyedit.c:4759
++#: g10/keyedit.c:3930 g10/keyedit.c:4220
msgid "Are you sure you still want to add it? (y/N) "
msgstr "你確定仍然想要增加嗎? (y/N) "
- #: g10/keyedit.c:4475
++#: g10/keyedit.c:3936
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:4490 g10/keygen.c:2708
++#: g10/keyedit.c:3951 g10/keygen.c:2708
msgid "Such a user ID already exists on this key!\n"
msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
- #: g10/keyedit.c:4592
++#: g10/keyedit.c:4053
msgid "Delete this good signature? (y/N/q)"
msgstr "刪除這份完好的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4063
msgid "Delete this invalid signature? (y/N/q)"
msgstr "刪除這份無效的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:4606
++#: g10/keyedit.c:4067
msgid "Delete this unknown signature? (y/N/q)"
msgstr "刪除這份未知的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:4613
++#: g10/keyedit.c:4074
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要刪除這份自我簽章嗎? (y/N)"
- #: g10/keyedit.c:4629
++#: g10/keyedit.c:4090
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "已經刪除了 %d 份簽章.\n"
- #: g10/keyedit.c:4633
++#: g10/keyedit.c:4094
msgid "Nothing deleted.\n"
msgstr "沒有刪除任何東西.\n"
- #: g10/keyedit.c:4668 g10/trust.c:731
++#: g10/keyedit.c:4129 g10/trust.c:731
msgid "invalid"
msgstr "無效"
- #: g10/keyedit.c:4670
++#: g10/keyedit.c:4131
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "使用者 ID \"%s\" 已精簡: %s\n"
- #: g10/keyedit.c:4676
++#: g10/keyedit.c:4137
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
- #: g10/keyedit.c:4684
++#: g10/keyedit.c:4145
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "使用者 ID \"%s\": 已經最小化了\n"
- #: g10/keyedit.c:4685
++#: g10/keyedit.c:4146
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
- #: g10/keyedit.c:4754
++#: g10/keyedit.c:4215
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4491,39 -3460,31 +4448,39 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4765
++#: g10/keyedit.c:4226
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:4782
++#: g10/keyedit.c:4243
msgid "Enter the user ID of the designated revoker: "
msgstr "輸入指定撤銷者的使用者 ID: "
- #: g10/keyedit.c:4807
++#: g10/keyedit.c:4268
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
- #: g10/keyedit.c:4822
++#: g10/keyedit.c:4283
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
- #: g10/keyedit.c:4844
++#: g10/keyedit.c:4305
msgid "this key has already been designated as a revoker\n"
msgstr "已指定這把金鑰為撤銷者了\n"
- #: g10/keyedit.c:4862
++#: g10/keyedit.c:4323
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
- #: g10/keyedit.c:4868
++#: g10/keyedit.c:4329
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:4932
++#: g10/keyedit.c:4397
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4532,172 -3493,140 +4489,178 @@@ msgid "
"N) "
msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:4937
++#: g10/keyedit.c:4402
msgid "Changing expiration time for a subkey.\n"
msgstr "正在變更子鑰的使用期限.\n"
- #: g10/keyedit.c:4940
++#: g10/keyedit.c:4405
msgid "Changing expiration time for the primary key.\n"
msgstr "正在變更主鑰的使用期限.\n"
- #: g10/keyedit.c:4994
++#: g10/keyedit.c:4461
msgid "You can't change the expiration date of a v3 key\n"
msgstr "你不能變更 v3 金鑰的使用期限\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:4640
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "簽署子鑰 %s 已經交叉認證過了\n"
- #: g10/keyedit.c:5179
++#: g10/keyedit.c:4646
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
- #: g10/keyedit.c:5296
++#: g10/keyedit.c:4763
msgid "Please select exactly one user ID.\n"
msgstr "請祇選擇一個使用者 ID.\n"
- #: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
++#: g10/keyedit.c:4804 g10/keyedit.c:4918 g10/keyedit.c:5031 g10/keyedit.c:5169
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
- #: g10/keyedit.c:5508
++#: g10/keyedit.c:4975
msgid "Enter your preferred keyserver URL: "
msgstr "請輸入你的偏好金鑰伺服器 URL: "
- #: g10/keyedit.c:5587
++#: g10/keyedit.c:5054
msgid "Are you sure you want to replace it? (y/N) "
msgstr "你確定要取代它嗎？ (y/N) "
- #: g10/keyedit.c:5588
++#: g10/keyedit.c:5055
msgid "Are you sure you want to delete it? (y/N) "
msgstr "你確定要刪除它嗎？ (y/N) "
- #: g10/keyedit.c:5648
++#: g10/keyedit.c:5115
msgid "Enter the notation: "
msgstr "請輸入註記: "
- #: g10/keyedit.c:5795
++#: g10/keyedit.c:5262
msgid "Proceed? (y/N) "
msgstr "是否繼續? (y/N) "
- #: g10/keyedit.c:5865
++#: g10/keyedit.c:5332
#, c-format
msgid "No user ID with index %d\n"
msgstr "索引 %d 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:5927
++#: g10/keyedit.c:5394
#, c-format
msgid "No user ID with hash %s\n"
msgstr "雜湊 %s 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:6028
++#: g10/keyedit.c:5495
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "索引 %d 沒有對應到子鑰\n"
- #: g10/keyedit.c:6050
++#: g10/keyedit.c:5517
#, c-format
msgid "No subkey with index %d\n"
msgstr "索引 %d 沒有對應到子鑰\n"
- #: g10/keyedit.c:6191
++#: g10/keyedit.c:5658
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "使用者 ID: \"%s\"\n"
- #: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
++#: g10/keyedit.c:5661 g10/keyedit.c:5763 g10/keyedit.c:5811
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
- #: g10/keyedit.c:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
++#: g10/keyedit.c:5663 g10/keyedit.c:5765 g10/keyedit.c:5813
msgid " (non-exportable)"
msgstr " (不可匯出)"
- #: g10/keyedit.c:6200
++#: g10/keyedit.c:5667
#, c-format
msgid "This signature expired on %s.\n"
msgstr "這份簽章已經在 %s 過期了.\n"
- #: g10/keyedit.c:6205
++#: g10/keyedit.c:5672
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "你確定仍然想要撤銷它嗎? (y/N) "
- #: g10/keyedit.c:6210
++#: g10/keyedit.c:5677
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:6264
++#: g10/keyedit.c:5731
msgid "Not signed by you.\n"
msgstr "並非由你所簽署.\n"
- #: g10/keyedit.c:6270
++#: g10/keyedit.c:5737
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
- #: g10/keyedit.c:6299
++#: g10/keyedit.c:5766
msgid " (non-revocable)"
msgstr " (不可撤銷)"
- #: g10/keyedit.c:6306
++#: g10/keyedit.c:5773
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
- #: g10/keyedit.c:6331
++#: g10/keyedit.c:5798
msgid "You are about to revoke these signatures:\n"
msgstr "你正要撤銷這些簽章:\n"
- #: g10/keyedit.c:6354
++#: g10/keyedit.c:5821
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要建立撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:6387
++#: g10/keyedit.c:5854
msgid "no secret key\n"
msgstr "沒有私鑰\n"
- #: g10/keyedit.c:6435
++#: g10/keyedit.c:5902
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
msgstr ""
- #: g10/keyedit.c:6445
++#: g10/keyedit.c:5912
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "使用者 ID \"%s\" 已撤銷\n"
- #: g10/keyedit.c:6462
++#: g10/keyedit.c:5929
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
- #: g10/keyedit.c:6558
++#: g10/keyedit.c:6025
#, fuzzy
#| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
msgstr "你不能刪除最後一個使用者 ID!\n"
- #: g10/keyedit.c:6596
++#: g10/keyedit.c:6063
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "金鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:6658
++#: g10/keyedit.c:6125
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:6755
++#: g10/keyedit.c:6222
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
++#: g10/keygen.c:168
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "選項 \"%.50s\" 的引數無效\n"
+
+#: g10/keygen.c:317
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "偏好設定 '%s' 重複了\n"
@@@ -5123,8 -3975,6 +5086,8 @@@ msgstr "
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\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
++#: g10/keygen.c:4349 g10/keygen.c:4836 g10/keygen.c:5099 g10/keygen.c:5204
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
@@@ -5195,7 -4032,6 +5158,7 @@@ msgstr "寫入公鑰鑰匙圈 '%s' 時�
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
- #: g10/keygen.c:4820
++#: g10/keygen.c:4823
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"
@@@ -5203,107 -4039,97 +5166,121 @@@ msgstr "
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
- #: g10/keygen.c:4966 g10/keygen.c:5150
++#: g10/keygen.c:4969 g10/keygen.c:5155
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4968 g10/keygen.c:5152
++#: g10/keygen.c:4971 g10/keygen.c:5157
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4979 g10/keygen.c:5163
++#: g10/keygen.c:4982 g10/keygen.c:5168
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
- #: g10/keygen.c:4991 g10/keygen.c:4993
++#: g10/keygen.c:4994 g10/keygen.c:4996
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
- #: g10/keygen.c:5000 g10/keygen.c:5002
++#: g10/keygen.c:5003 g10/keygen.c:5005
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
- #: g10/keygen.c:5021 g10/keygen.c:5177
++#: g10/keygen.c:5024 g10/keygen.c:5182
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
- #: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
++#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
msgstr "永遠不過期"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "關鍵簽章原則: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "簽章原則: "
- #: g10/keylist.c:372
++#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
msgstr "執意偏好的金鑰伺服器: "
- #: g10/keylist.c:425
++#: g10/keylist.c:426
msgid "Critical signature notation: "
msgstr "關鍵簽章註記: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Signature notation: "
msgstr "簽章註記: "
- #: g10/keylist.c:473
++#: g10/keylist.c:474
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "%d 份損壞的簽章\n"
- #: g10/keylist.c:486
++#: g10/keylist.c:478
+ #, fuzzy, c-format
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d 份損壞的簽章\n"
+
++#: g10/keylist.c:482
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to a missing key\n"
+ msgid "%d signature not checked due to a missing key\n"
+ msgid_plural "%d signatures not checked due to missing keys\n"
+ msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
+
++#: g10/keylist.c:487
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
- #: g10/keylist.c:568
++#: g10/keylist.c:569
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] "警告: %lu 把金鑰因尺寸太大已跳過\n"
- #: g10/keylist.c:590
++#: g10/keylist.c:591
msgid "Keyring"
msgstr "鑰匙圈"
- #: g10/keylist.c:1755
++#: g10/keylist.c:1805
msgid "Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1757
++#: g10/keylist.c:1807
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1765
++#: g10/keylist.c:1815
msgid " Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1767 g10/keylist.c:1777
++#: g10/keylist.c:1817 g10/keylist.c:1827
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
# use tty
- #: g10/keylist.c:1772 g10/keylist.c:1788
++#: g10/keylist.c:1822 g10/keylist.c:1838
msgid " Key fingerprint ="
msgstr " 金鑰指紋 ="
- #: g10/keylist.c:1839
++#: g10/keylist.c:1889
msgid " Card serial no. ="
msgstr " 卡片序號 ="
@@@ -5409,256 -4214,207 +5386,262 @@@ msgstr "在金鑰伺服器上找不到�
msgid "no keyserver known (use option --keyserver)\n"
msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
- #: g10/keyserver.c:1706
++#: g10/keyserver.c:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
- #: g10/keyserver.c:1710
++#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "正在請求金鑰 %s 自 %s\n"
- #: g10/keyserver.c:1811 g10/keyserver.c:1967
++#: g10/keyserver.c:1818 g10/keyserver.c:1996
#, fuzzy
#| msgid "invalid keyserver options\n"
msgid "no keyserver known\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
++#: g10/keyserver.c:1833 g10/skclist.c:214 g10/skclist.c:242
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "已跳過 \"%s\": %s\n"
- #: g10/keyserver.c:1829
++#: g10/keyserver.c:1836
#, c-format
msgid "sending key %s to %s\n"
msgstr "遞送金鑰 %s 至 %s\n"
- #: g10/keyserver.c:1870
++#: g10/keyserver.c:1877
#, c-format
msgid "requesting key from '%s'\n"
msgstr "正在向 '%s' 請求金鑰\n"
- #: g10/keyserver.c:1886
++#: g10/keyserver.c:1893
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告: 無法抓取 URI %s: %s\n"
- #: g10/mainproc.c:254
++#: g10/mainproc.c:255
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
- #: g10/mainproc.c:302
++#: g10/mainproc.c:303
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密過的階段金鑰\n"
- #: g10/mainproc.c:312
++#: g10/mainproc.c:313
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密語係以未知的 %d 摘要演算法所產生\n"
- #: g10/mainproc.c:378
++#: g10/mainproc.c:379
#, c-format
msgid "public key is %s\n"
msgstr "公鑰為 %s\n"
- #: g10/mainproc.c:456
++#: g10/mainproc.c:457
msgid "public key encrypted data: good DEK\n"
msgstr "公鑰加密過的資料: 完好的 DEK\n"
- #: g10/mainproc.c:489
++#: g10/mainproc.c:490
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "已用 %u 位元長的 %s 金鑰, ID %s, 建立於 %s 所加密\n"
- #: g10/mainproc.c:493 g10/pkclist.c:228
++#: g10/mainproc.c:494 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:497
++#: g10/mainproc.c:498
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "已用 %s 金鑰, ID %s 所加密\n"
- #: g10/mainproc.c:514
++#: g10/mainproc.c:515
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公鑰解密失敗: %s\n"
- #: g10/mainproc.c:530
++#: g10/mainproc.c:531
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "已用 %lu 個密語加密了\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:533
msgid "encrypted with 1 passphrase\n"
msgstr "已用 1 個密語加密了\n"
- #: g10/mainproc.c:566 g10/mainproc.c:587
++#: g10/mainproc.c:567 g10/mainproc.c:588
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 為加密過的資料\n"
- #: g10/mainproc.c:573
++#: g10/mainproc.c:574
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
- #: g10/mainproc.c:618 g10/mainproc.c:632
++#: g10/mainproc.c:659 g10/mainproc.c:673
msgid "WARNING: message was not integrity protected\n"
msgstr "警告: 訊息未受到完整的保護\n"
- #: g10/mainproc.c:628
++#: g10/mainproc.c:669
msgid "decryption okay\n"
msgstr "解密成功\n"
- #: g10/mainproc.c:637
++#: g10/mainproc.c:678
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告: 加密過的訊息已經被變造了!\n"
- #: g10/mainproc.c:653
++#: g10/mainproc.c:695
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失敗: %s\n"
- #: g10/mainproc.c:676
++#: g10/mainproc.c:718
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:720
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始的檔名 ='%.*s'\n"
- #: g10/mainproc.c:748
++#: g10/mainproc.c:790
msgid "WARNING: multiple plaintexts seen\n"
msgstr "警告: 看到了多份明文\n"
- #: g10/mainproc.c:923
++#: g10/mainproc.c:965
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
- #: g10/mainproc.c:1223 g10/mainproc.c:1266
++#: g10/mainproc.c:1265 g10/mainproc.c:1308
msgid "no signature found\n"
msgstr "找不到簽章\n"
- #: g10/mainproc.c:1600
++#: g10/mainproc.c:1642
#, c-format
msgid "BAD signature from \"%s\""
msgstr "*損壞* 的簽章來自於 \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1644
#, c-format
msgid "Expired signature from \"%s\""
msgstr "過期的簽章來自於 \"%s\""
- #: g10/mainproc.c:1604
++#: g10/mainproc.c:1646
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的簽章來自於 \"%s\""
- #: g10/mainproc.c:1623
++#: g10/mainproc.c:1666
msgid "signature verification suppressed\n"
msgstr "簽章驗證已抑制\n"
- #: g10/mainproc.c:1732
++#: g10/mainproc.c:1775
msgid "can't handle this ambiguous signature data\n"
msgstr "無法處理這個不明確的簽章資料\n"
- #: g10/mainproc.c:1746 g10/mainproc.c:1754
++#: g10/mainproc.c:1789 g10/mainproc.c:1797
#, c-format
msgid "Signature made %s\n"
msgstr "由 %s 建立的簽章\n"
- #: g10/mainproc.c:1747 g10/mainproc.c:1755
++#: g10/mainproc.c:1790 g10/mainproc.c:1798
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 金鑰 %s\n"
- #: g10/mainproc.c:1759
++#: g10/mainproc.c:1802
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
- #: g10/mainproc.c:1765
++#: g10/mainproc.c:1808
#, fuzzy, c-format
#| msgid " aka \"%s\""
msgid " issuer \"%s\"\n"
msgstr " 亦即 \"%s\""
- #: g10/mainproc.c:1782
++#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "可用的金鑰於: "
- #: g10/mainproc.c:2017
++#: g10/mainproc.c:2063
msgid "[uncertain]"
msgstr "[ 不確定 ]"
- #: g10/mainproc.c:2055
++#: g10/mainproc.c:2101
#, c-format
msgid " aka \"%s\""
msgstr " 亦即 \"%s\""
- #: g10/mainproc.c:2138
++#: g10/mainproc.c:2176
+ #, fuzzy, c-format
+ #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ msgid "WARNING: This key is not suitable for signing in %s mode\n"
+ msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
+
++#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "這份簽署已經在 %s 過期了\n"
- #: g10/mainproc.c:2142
++#: g10/mainproc.c:2198
#, c-format
msgid "Signature expires %s\n"
msgstr "這份簽署將在 %s 到期\n"
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2209
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
- #: g10/mainproc.c:2154
++#: g10/mainproc.c:2210
msgid "binary"
msgstr "二進制"
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2211
msgid "textmode"
msgstr "文字模式"
- #: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
++#: g10/mainproc.c:2211 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2213
msgid ", key algorithm "
msgstr ", 金鑰演算法 "
- #: g10/mainproc.c:2192
++#: g10/mainproc.c:2248
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2222
++#: g10/mainproc.c:2287
#, c-format
msgid "Can't check signature: %s\n"
msgstr "無法檢查簽章: %s\n"
- #: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
++#: g10/mainproc.c:2380 g10/mainproc.c:2399 g10/mainproc.c:2523
msgid "not a detached signature\n"
msgstr "不是一份分離的簽章\n"
- #: g10/mainproc.c:2368
++#: g10/mainproc.c:2433
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
- #: g10/mainproc.c:2377
++#: g10/mainproc.c:2442
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等級 0x%02x 的獨立簽章\n"
- #: g10/mainproc.c:2462
++#: g10/mainproc.c:2527
msgid "old style (PGP 2.x) signature\n"
msgstr "舊型 (PGP 2.x) 簽章\n"
@@@ -5717,66 -4462,53 +5700,66 @@@ msgstr "'%s' 讀取錯誤: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1147
++#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
- #: g10/misc.c:1151
++#: g10/misc.c:1063
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告: 已不建議使用 \"%s\" 選項\n"
- #: g10/misc.c:1153
++#: g10/misc.c:1065
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "請改以 \"%s%s\" 代替\n"
- #: g10/misc.c:1160
++#: g10/misc.c:1072
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
- #: g10/misc.c:1170
++#: g10/misc.c:1082
#, 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:1174
++#: g10/misc.c:1086
#, 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:1238
++#: g10/misc.c:1150
msgid "Uncompressed"
msgstr "未壓縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1263
++#: g10/misc.c:1175
msgid "uncompressed|none"
msgstr "uncompressed|none|未壓縮|無"
- #: g10/misc.c:1388
++#: g10/misc.c:1282
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "這個訊息對 %s 來說無法使用\n"
- #: g10/misc.c:1563
++#: g10/misc.c:1457
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "不明確的選項 '%s'\n"
- #: g10/misc.c:1588
++#: g10/misc.c:1482
#, c-format
msgid "unknown option '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/misc.c:1826
++#: g10/misc.c:1720
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
- #: g10/misc.c:1848
++#: g10/misc.c:1742
#, fuzzy, c-format
#| msgid "Unknown signature type '%s'\n"
msgid "unknown weak digest '%s'\n"
@@@ -6273,35 -4906,33 +6256,41 @@@ msgstr "無法開啟被簽署過的資�
msgid "can't open signed data fd=%d: %s\n"
msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
- #: g10/pubkey-enc.c:116
++#: g10/pubkey-enc.c:97 g10/pubkey-enc.c:135 sm/decrypt.c:492
+ #, fuzzy, c-format
+ #| msgid "certificate is not usable for encryption\n"
+ msgid "Note: key %s is not suitable for encryption in %s mode\n"
+ msgstr "憑證無法用於加密\n"
+
++#: g10/pubkey-enc.c:128
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
- #: g10/pubkey-enc.c:123
++#: g10/pubkey-enc.c:144
msgid "okay, we are the anonymous recipient.\n"
msgstr "很好, 我們就是匿名收件者.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:304
msgid "old encoding of the DEK is not supported\n"
msgstr "不支援舊式的 DEK 編碼\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:332
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "%d%s 編密演算法未知或已停用\n"
- #: g10/pubkey-enc.c:355
++#: g10/pubkey-enc.c:376
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
- #: g10/pubkey-enc.c:388
++#: g10/pubkey-enc.c:409
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
- #: g10/pubkey-enc.c:395
++#: g10/pubkey-enc.c:416
msgid "Note: key has been revoked"
msgstr "請注意: 金鑰已撤銷"
@@@ -6476,7 -5079,6 +6465,7 @@@ msgstr "(沒有給定描述)\n
msgid "Is this okay? (y/N) "
msgstr "這樣可以嗎? (y/N) "
- #: g10/seskey.c:62 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
msgstr "建立了弱金鑰 - 重試中\n"
@@@ -6495,40 -5094,38 +6484,46 @@@ msgstr "%s 金鑰 %s 使用不安全 (%
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
- #: g10/sig-check.c:144
++#: g10/sig-check.c:153
msgid "WARNING: signature digest conflict in message\n"
msgstr "警告: 簽章摘要與訊息不一致\n"
- #: g10/sig-check.c:171
++#: g10/sig-check.c:164 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+ #, fuzzy, c-format
+ #| msgid "you may not use %s while in %s mode\n"
+ msgid "key %s may not be used for signing in %s mode\n"
+ msgstr "你不能夠將 %s 用於 %s 模式中\n"
+
++#: g10/sig-check.c:191
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
- #: g10/sig-check.c:173
++#: g10/sig-check.c:193
#, c-format
msgid "please see %s for more information\n"
msgstr "請參考 %s 上進一步的資訊\n"
- #: g10/sig-check.c:183
++#: g10/sig-check.c:203
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
- #: g10/sig-check.c:303
++#: g10/sig-check.c:324
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:312
++#: g10/sig-check.c:333
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:326 g10/sign.c:266
++#: g10/sig-check.c:347 g10/sign.c:267
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6539,7 -5136,6 +6534,7 @@@ msgid_plural "
msgstr[0] ""
"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:356
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6549,83 -5145,67 +6544,83 @@@ msgid_plural "
msgstr[0] ""
"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/sig-check.c:352
++#: g10/sig-check.c:373
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
- #: g10/sig-check.c:363
++#: g10/sig-check.c:384
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
- #: g10/sig-check.c:497
++#: g10/sig-check.c:518
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
- #: g10/sig-check.c:1088
++#: g10/sig-check.c:1109
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
- #: g10/sig-check.c:1091
++#: g10/sig-check.c:1112
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
- #: g10/sign.c:88
++#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:114
++#: g10/sign.c:115
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:137
++#: g10/sign.c:138
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:331
++#: g10/sign.c:363
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 簽章來自: \"%s\"\n"
- #: g10/sign.c:890
++#: g10/sign.c:922
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
- #: g10/sign.c:1021
++#: g10/sign.c:1053
msgid "signing:"
msgstr "簽署:"
- #: g10/sign.c:1298
++#: g10/sign.c:1330
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密將被採用\n"
- #: g10/skclist.c:181 g10/skclist.c:262
++#: g10/skclist.c:173 g10/skclist.c:254
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
- #: g10/skclist.c:213
++#: g10/skclist.c:205
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "已跳過 \"%s\": 重複了\n"
- #: g10/skclist.c:232
++#: g10/skclist.c:224
msgid "skipped: secret key already present\n"
msgstr "已跳過: 私鑰已經存在\n"
- #: g10/skclist.c:251
++#: g10/skclist.c:243
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
@@@ -6708,7 -5272,6 +6703,7 @@@ msgstr "信任資料庫更動量過大\
msgid "%s: directory does not exist!\n"
msgstr "%s: 目錄不存在!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:585
++#: g10/tdbio.c:704 dirmngr/http.c:590
#, c-format
msgid "can't access '%s': %s\n"
msgstr "無法存取 '%s': %s\n"
@@@ -6817,216 -5358,177 +6812,216 @@@ msgstr "無法處理長於 %d 字符的
msgid "input line longer than %d characters\n"
msgstr "輸入列比 %d 字符還長\n"
- #: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
++#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "送出標準選項時出錯: %s\n"
- #: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
++#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:355 g10/tofu.c:888
++#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:505
++#: g10/tofu.c:504
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "未支援的演算法: %s"
- #: g10/tofu.c:538
++#: g10/tofu.c:537
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
msgstr "建立暫存檔時出錯: %s\n"
- #: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
msgid "TOFU DB error"
msgstr ""
- #: 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
++#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2352 g10/tofu.c:2371
++#: g10/tofu.c:2384 g10/tofu.c:2396 g10/tofu.c:2411 g10/tofu.c:2423
++#: g10/tofu.c:3018 g10/tofu.c:3035 g10/tofu.c:3072 g10/tofu.c:3089
++#: g10/tofu.c:3399
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:716 g10/tofu.c:724
++#: g10/tofu.c:715 g10/tofu.c:723
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "寫入 base64 編碼時出錯: %s\n"
- #: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
++#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "啟始讀取程式物件時出錯: %s\n"
- #: g10/tofu.c:844
++#: g10/tofu.c:843
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error creating 'encryptions' TOFU table: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:874
++#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
msgstr ""
- #: g10/tofu.c:956
++#: g10/tofu.c:955
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
++#: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:1328
++#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
msgstr ""
- #: g10/tofu.c:1337
++#: g10/tofu.c:1336
#, 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] ""
- #: g10/tofu.c:1343
++#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1349
++#: g10/tofu.c:1348
#, c-format
msgid ""
"Please indicate whether this email address should be associated with key %s "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1609
++#: g10/tofu.c:1608
#, 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:1619
++#: g10/tofu.c:1618
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "列出金鑰和使用者 ID"
- #: g10/tofu.c:1635 g10/tofu.c:1800
++#: g10/tofu.c:1634 g10/tofu.c:1799
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性: %s"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1725
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "取得已存放的旗標時出錯: %s\n"
- #: g10/tofu.c:1730
++#: g10/tofu.c:1729
#, 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:1748
++#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1798
++#: g10/tofu.c:1797
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出金鑰"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1823
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "印出訊息摘要"
- #: g10/tofu.c:1828
++#: g10/tofu.c:1827
#, 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:1835
++#: g10/tofu.c:1834
#, 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:1839
++#: g10/tofu.c:1838
#, 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:1853
++#: g10/tofu.c:1852
#, 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:1859
++#: g10/tofu.c:1858
#, 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:1869
++#: g10/tofu.c:1868
#, 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:1875
++#: g10/tofu.c:1874
#, 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:1885
++#: g10/tofu.c:1884
#, 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:1891
++#: g10/tofu.c:1890
#, 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:1899
++#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1903
++#: g10/tofu.c:1902
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7035,145 -5537,119 +7030,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:1920
++#: g10/tofu.c:1919
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:1962
++#: g10/tofu.c:1961
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1968
++#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1976
++#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2091 g10/tofu.c:2227
++#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2147
++#: g10/tofu.c:2146
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "寫入金鑰時出錯: %s\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2613
#, 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:2827
++#: g10/tofu.c:2826
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "建立管道時出錯: %s\n"
- #: g10/tofu.c:2878
++#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
- #: g10/tofu.c:2883
++#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
- #: g10/tofu.c:2888
++#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
- #: g10/tofu.c:2893
++#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
- #: g10/tofu.c:2898
++#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
- #: g10/tofu.c:2903
++#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
- #: g10/tofu.c:2905
++#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
- #: g10/tofu.c:3144
++#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3150
++#: g10/tofu.c:3148
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "已經刪除了 %d 份簽章.\n"
- #: g10/tofu.c:3158
++#: g10/tofu.c:3156
#, 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:3168
++#: g10/tofu.c:3166
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "已用 %lu 個密語加密了\n"
- #: g10/tofu.c:3176
++#: g10/tofu.c:3174
#, 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:3187
++#: g10/tofu.c:3185
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "有效性: %s"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3228
++#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3231
++#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3260
++#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7189,19 -5665,15 +7184,19 @@@ msgid_plural "
"to mark it as being bad.\n"
msgstr[0] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3495 g10/tofu.c:3697 g10/tofu.c:3741
++#: g10/tofu.c:3880 g10/tofu.c:3955 g10/tofu.c:3991
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:3530
++#: g10/tofu.c:3528
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3917
++#: g10/tofu.c:3915
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7440,19 -5867,14 +7435,19 @@@ msgstr "
"語法: kbxutil [選項] [檔案]\n"
"列出, 匯出, 匯入金鑰鑰匙盒資料\n"
- #: scd/app-nks.c:718 scd/app-openpgp.c:3365
++#: scd/app-nks.c:718 scd/app-openpgp.c:3382
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
- #: scd/app-nks.c:726 scd/app-openpgp.c:3377
++#: scd/app-nks.c:726 scd/app-openpgp.c:3394
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
- #: scd/app-nks.c:806 scd/app-openpgp.c: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
++#: scd/app-nks.c:806 scd/app-openpgp.c:2139 scd/app-openpgp.c:2158
++#: scd/app-openpgp.c:2311 scd/app-openpgp.c:2328 scd/app-openpgp.c:2592
++#: scd/app-openpgp.c:2639 scd/app-openpgp.c:2744 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
@@@ -7497,44 -5910,35 +7492,44 @@@ msgid "
"qualified signatures."
msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2656 scd/app-dinsig.c:531
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2673 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
- #: scd/app-openpgp.c:801
++#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "存放指紋失敗: %s\n"
- #: scd/app-openpgp.c:814
++#: scd/app-openpgp.c:831
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "存放創生日期失敗: %s\n"
- #: scd/app-openpgp.c:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
++#: scd/app-openpgp.c:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4729
msgid "error retrieving CHV status from card\n"
msgstr "從卡片取回 CHV 狀態時出錯\n"
- #: scd/app-openpgp.c:1335
++#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
msgstr "回應中未包含 RSA 系數\n"
- #: scd/app-openpgp.c:1342
++#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
msgstr "回應中未包含 RSA 公用指數\n"
- #: scd/app-openpgp.c:1452
++#: scd/app-openpgp.c:1469
#, fuzzy
#| msgid "response does not contain the EC public point\n"
msgid "response does not contain the EC public key\n"
msgstr "回應中未包含 EC 公用指數\n"
- #: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
++#: scd/app-openpgp.c:1569 scd/app-openpgp.c:3998
msgid "response does not contain the public key data\n"
msgstr "回應中未包含公鑰資料\n"
- #: scd/app-openpgp.c:1652
++#: scd/app-openpgp.c:1669
#, c-format
msgid "reading public key failed: %s\n"
msgstr "讀取公鑰時失敗: %s\n"
@@@ -7542,55 -5946,44 +7537,55 @@@
#. 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
++#: scd/app-openpgp.c:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
msgstr ""
- #: scd/app-openpgp.c:2004
++#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
msgstr ""
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
- #: scd/app-openpgp.c:2020
++#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
msgstr ""
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
msgstr "以 %s 做為預設 PIN\n"
- #: scd/app-openpgp.c:2083
++#: scd/app-openpgp.c:2100
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
- #: scd/app-openpgp.c:2096
++#: scd/app-openpgp.c:2113
#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
msgstr "||請輸入個人識別碼 (PIN)"
- #: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
++#: scd/app-openpgp.c:2165 scd/app-openpgp.c:2335 scd/app-openpgp.c:2599
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
- #: scd/app-openpgp.c:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
- #: scd/app-openpgp.c:4282
++#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2217 scd/app-openpgp.c:2347
++#: scd/app-openpgp.c:4299
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "驗證 CHV%d 失敗: %s\n"
- #: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
++#: scd/app-openpgp.c:2246 scd/app-openpgp.c:4738
msgid "card is permanently locked!\n"
msgstr "卡片永久鎖定了!!\n"
- #: scd/app-openpgp.c:2233
++#: scd/app-openpgp.c:2250
#, fuzzy, c-format
#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7600,23 -5993,18 +7595,23 @@@ msgstr[0] "%d 管理者個人識別碼
#. 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
++#: scd/app-openpgp.c:2260
msgid "|A|Please enter the Admin PIN"
msgstr "|A|請輸入管理者 PIN"
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2282
msgid "access to admin commands is not configured\n"
msgstr "管理者指令存取權限尚未組態\n"
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||請輸入個人識別碼 (PIN)"
- #: scd/app-openpgp.c:2618
++#: scd/app-openpgp.c:2635
msgid "||Please enter the Reset Code for the card"
msgstr "||請輸入卡片的重設碼"
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
++#: scd/app-openpgp.c:2645 scd/app-openpgp.c:2699
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "重設碼太短; 長度最少要有 %d\n"
@@@ -7624,109 -6012,85 +7619,109 @@@
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
- #: scd/app-openpgp.c:2651
++#: scd/app-openpgp.c:2668
msgid "|RN|New Reset Code"
msgstr "|RN|新增重設碼"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|AN|New Admin PIN"
msgstr "|AN|新增管理者個人識別碼 (PIN)"
- #: scd/app-openpgp.c:2652
++#: scd/app-openpgp.c:2669
msgid "|N|New PIN"
msgstr "|N|新增個人識別碼 (PIN)"
- #: scd/app-openpgp.c:2723
++#: scd/app-openpgp.c:2740
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
- #: scd/app-openpgp.c:2724
++#: scd/app-openpgp.c:2741
msgid "||Please enter the PIN and New PIN"
msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
- #: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
++#: scd/app-openpgp.c:2797 scd/app-openpgp.c:4058
msgid "error reading application data\n"
msgstr "讀取應用程式資料時出錯\n"
- #: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
++#: scd/app-openpgp.c:2803 scd/app-openpgp.c:4065
msgid "error reading fingerprint DO\n"
msgstr "讀取指紋 DO 時出錯\n"
- #: scd/app-openpgp.c:2796
++#: scd/app-openpgp.c:2813
msgid "key already exists\n"
msgstr "金鑰已存在\n"
- #: scd/app-openpgp.c:2800
++#: scd/app-openpgp.c:2817
msgid "existing key will be replaced\n"
msgstr "既有的金鑰將被取代\n"
- #: scd/app-openpgp.c:2802
++#: scd/app-openpgp.c:2819
msgid "generating new key\n"
msgstr "正在產生新的金鑰\n"
- #: scd/app-openpgp.c:2804
++#: scd/app-openpgp.c:2821
msgid "writing new key\n"
msgstr "正在寫入新的金鑰\n"
- #: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
++#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
msgid "creation timestamp missing\n"
msgstr "缺漏創生時間戳印\n"
- #: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
++#: scd/app-openpgp.c:3404 scd/app-openpgp.c:3412
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
- #: scd/app-openpgp.c:3528 scd/app-openpgp.c:3803
++#: scd/app-openpgp.c:3545 scd/app-openpgp.c:3820
#, c-format
msgid "failed to store the key: %s\n"
msgstr "存放金鑰失敗: %s\n"
- #: scd/app-openpgp.c:3691
++#: scd/app-openpgp.c:3708
#, fuzzy
#| msgid "unsupported inquiry '%s'\n"
msgid "unsupported curve\n"
msgstr "未支援的查詢 '%s'\n"
- #: scd/app-openpgp.c:3958
++#: scd/app-openpgp.c:3975
msgid "please wait while key is being generated ...\n"
msgstr "正在產生金鑰中, 請稍候 ...\n"
- #: scd/app-openpgp.c:3966
++#: scd/app-openpgp.c:3983
msgid "generating key failed\n"
msgstr "產生金鑰時失敗\n"
- #: scd/app-openpgp.c:3972
++#: scd/app-openpgp.c:3989
#, fuzzy, c-format
#| msgid "key generation completed (%d seconds)\n"
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
msgstr[0] "金鑰產生完畢 (%d 秒)\n"
- #: scd/app-openpgp.c:4006
++#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
- #: scd/app-openpgp.c:4056
++#: scd/app-openpgp.c:4073
msgid "fingerprint on card does not match requested one\n"
msgstr "卡片上的指紋與所要求的那個並不吻合\n"
- #: scd/app-openpgp.c:4172
++#: scd/app-openpgp.c:4189
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡片不支援 %s 摘要演算法\n"
- #: scd/app-openpgp.c:4257
++#: scd/app-openpgp.c:4274
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前建立的簽章: %lu\n"
- #: scd/app-openpgp.c:4726
++#: scd/app-openpgp.c:4743
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
- #: scd/app-openpgp.c:5027 scd/app-openpgp.c:5038
++#: scd/app-openpgp.c:5055 scd/app-openpgp.c:5066
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@@ -7746,11 -6107,9 +7741,11 @@@ msgstr "|N|開始新增個人識別碼
msgid "run in multi server mode (foreground)"
msgstr "以多重伺服器模式執行 (前景)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:180
++#: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|等級|設定除錯等級為指定等級"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
msgid "|FILE|write a log to FILE"
msgstr "|檔案|將日誌寫入至指定檔案"
@@@ -7802,12 -6150,10 +7797,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
#, c-format
msgid "handler for fd %d started\n"
msgstr "用於 fd %d 的經手程式已啟動\n"
- #: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
++#: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "用於 fd %d 的經手程式已終止\n"
@@@ -7880,9 -6211,6 +7875,9 @@@ msgstr "吻合的憑證數量: %d\n
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
- #: sm/encrypt.c:342 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
- #: sm/sign.c:337 sm/verify.c:114
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
++#: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/sign.c:337 sm/verify.c:115
msgid "failed to allocate keyDB handle\n"
msgstr "配置 keyDB 代號失敗\n"
@@@ -8054,7 -6342,6 +8049,7 @@@ msgstr "已使用的驗證模型: %s
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
- #: sm/certcheck.c:244 sm/verify.c:209
++#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
msgstr "(這是 MD2 演算法)\n"
@@@ -8096,7 -6376,6 +8091,7 @@@ msgstr "
msgid "no key usage specified - assuming all usages\n"
msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
++#: sm/certlist.c:132 sm/keylist.c:275 dirmngr/validate.c:1121
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得金鑰用途資訊時出錯: %s\n"
@@@ -8349,11 -6575,9 +8344,11 @@@ msgstr "準備好了. 你現在就該�
msgid "resource problem: out of core\n"
msgstr "資源問題: 超出核心\n"
- #: sm/decrypt.c:339
++#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
msgstr "(這是 RC2 演算法)\n"
- #: sm/decrypt.c:341
++#: sm/decrypt.c:343
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(這看起來不像是個加密過的訊息)\n"
@@@ -8382,127 -6601,96 +8377,127 @@@ msgstr "憑證 '%s' 已刪除\n
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
- #: sm/encrypt.c:328
++#: sm/encrypt.c:330
msgid "no valid recipients given\n"
msgstr "沒有給定有效的收件者\n"
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:210
msgid "list external keys"
msgstr "列出外部金鑰"
- #: sm/gpgsm.c:211
++#: sm/gpgsm.c:212
msgid "list certificate chain"
msgstr "列出憑證鏈"
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
msgid "import certificates"
msgstr "匯入憑證"
- #: sm/gpgsm.c:220
++#: sm/gpgsm.c:221
msgid "export certificates"
msgstr "匯出憑證"
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:229
msgid "register a smartcard"
msgstr "註冊智慧卡"
- #: sm/gpgsm.c:231
++#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
msgstr "將指令遞送給 dirmngr"
- #: sm/gpgsm.c:233
++#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
msgstr "叫用 gpg-protect-tool"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
msgstr "建立以 base-64 編碼過的輸出"
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
msgstr "假設輸入的是 PEM 格式"
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
msgstr "假設輸入的是 base-64 格式"
- #: sm/gpgsm.c:262
++#: sm/gpgsm.c:263
msgid "assume input is in binary format"
msgstr "假設輸入的是二進制格式"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:270
msgid "never consult a CRL"
msgstr "永遠不要查閱 CRL"
- #: sm/gpgsm.c:279
++#: sm/gpgsm.c:280
msgid "check validity using OCSP"
msgstr "用 OCSP 檢查有效性"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
msgstr "|N|要包含的憑證數量"
- #: sm/gpgsm.c:287
++#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
msgstr "|檔案|從指定檔案中取得原則資訊"
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:291
msgid "do not check certificate policies"
msgstr "不要檢查憑證原則"
- #: sm/gpgsm.c:294
++#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
msgstr "取回遺失的發行者憑證"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
msgstr "完全不要使用終端機"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
msgstr "|檔案|將稽核日誌寫入至指定檔案"
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:316
msgid "batch mode: never ask"
msgstr "批次模式: 永遠不詢問"
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:317
msgid "assume yes on most questions"
msgstr "假設大部分的問題都回答是"
- #: sm/gpgsm.c:317
++#: sm/gpgsm.c:318
msgid "assume no on most questions"
msgstr "假設大部分的問題都回答否"
- #: sm/gpgsm.c:320
++#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
- #: sm/gpgsm.c:323
++#: sm/gpgsm.c:324
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:809
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:813
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
msgstr "|名稱|使用指定名稱的編密演算法"
- #: sm/gpgsm.c:352
++#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
msgstr "|名稱|使用指定名稱的訊息摘要演算法"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:563
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8512,46 -6700,37 +8507,46 @@@ msgstr "
"用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:767
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "請注意: 將無法加密為 '%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "未知的驗證模型 '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: 沒有給定主機名稱\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:848 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: 給定的密碼沒有使用者\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:869 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: 正在跳過這一列\n"
- #: sm/gpgsm.c:1427
++#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
msgstr "無法剖析金鑰伺服器\n"
- #: sm/gpgsm.c:1630
++#: sm/gpgsm.c:1684
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "正在匯入通用憑證 '%s'\n"
- #: sm/gpgsm.c:1671
++#: sm/gpgsm.c:1725
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "無法用 '%s' 來簽署: %s\n"
- #: sm/gpgsm.c:2028
++#: sm/gpgsm.c:2082
msgid "invalid command (there is no implicit command)\n"
msgstr "無效的指令 (沒有這樣的指令)\n"
@@@ -8612,7 -6779,6 +8607,7 @@@ msgstr "重新搜尋憑證的問題: %s
msgid "error storing flags: %s\n"
msgstr "存放旗標時出錯: %s\n"
- #: sm/keylist.c:669
++#: sm/keylist.c:670
msgid "Error - "
msgstr "錯誤 - "
@@@ -8646,7 -6808,6 +8641,7 @@@ msgstr "
"\n"
"%s%s請問你是否真的確定要這樣做了?"
- #: sm/qualified.c:215 sm/verify.c:624
++#: sm/qualified.c:215 sm/verify.c:653
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@@ -8663,48 -6823,38 +8658,48 @@@ msgstr "
"\"%s\"\n"
"請注意, 這個憑證並 不會 建立出合格的簽章!"
- #: sm/sign.c:454
++#: sm/sign.c:465
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "雜湊演算法 %d (%s) 為簽署者 %d 所用, 但並不支援; 改用 %s\n"
- #: sm/sign.c:468
++#: sm/sign.c:508
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
- #: sm/sign.c:520
++#: sm/sign.c:560
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "檢查合格憑證時失敗: %s\n"
- #: sm/verify.c:457
++#: sm/verify.c:486
msgid "Signature made "
msgstr "簽章建立於 "
- #: sm/verify.c:461
++#: sm/verify.c:490
msgid "[date not given]"
msgstr "[ 未給定日期 ]"
- #: sm/verify.c:462
++#: sm/verify.c:491
#, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr " 以憑證 ID 0x%08lX\n"
- #: sm/verify.c:481
++#: sm/verify.c:510
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
- #: sm/verify.c:602
++#: sm/verify.c:631
msgid "Good signature from"
msgstr "完好的簽章來自於"
- #: sm/verify.c:603
++#: sm/verify.c:632
msgid " aka"
msgstr " 亦即"
- #: sm/verify.c:621
++#: sm/verify.c:650
msgid "This is a qualified signature\n"
msgstr "這是一份合格簽章\n"
@@@ -9470,112 -7459,84 +9465,112 @@@ msgstr "應該要有絕對檔名\n
msgid "looking up '%s'\n"
msgstr "正在查找 '%s'\n"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
msgid "list the contents of the CRL cache"
msgstr "列出 CRL 快取的內容"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:167
msgid "|FILE|load CRL from FILE into cache"
msgstr "|檔案|從指定檔案載入 CRL 至快取"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:168
msgid "|URL|fetch a CRL from URL"
msgstr "|網址|從指定網址取得 CRL"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:169
msgid "shutdown the dirmngr"
msgstr "關閉 dirmngr"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:170
msgid "flush the cache"
msgstr "清除快取"
- #: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
- #: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
++#: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
++#: tools/gpgconf-comp.c:827 tools/gpgconf-comp.c:923
msgid "|FILE|write server mode logs to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
msgid "run without asking a user"
msgstr "以不詢問使用者的方式執行"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "force loading of outdated CRLs"
msgstr "強迫載入過時的 CRL"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
msgid "allow sending OCSP requests"
msgstr "允許送出 OCSP 請求"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "inhibit the use of HTTP"
msgstr "避免使用 HTTP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
msgid "inhibit the use of LDAP"
msgstr "避免使用 LDAP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "ignore HTTP CRL distribution points"
msgstr "忽略 HTTP CRL 分布點"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "ignore LDAP CRL distribution points"
msgstr "忽略 LDAP CRL 分布點"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "ignore certificate contained OCSP service URLs"
msgstr "忽略含有 OCSP 伺服器網址的憑證"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "|HOST|use HOST for LDAP queries"
msgstr "|主機|指定 LDAP 查詢主機"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:205
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "不要將主機備案與 --ldap-proxy 並用"
- #: dirmngr/dirmngr.c:206
++#: dirmngr/dirmngr.c:208
msgid "|FILE|read LDAP server list from FILE"
msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:210
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
- #: dirmngr/dirmngr.c:211 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|把 LDAP 逾時設成 N 秒"
- #: dirmngr/dirmngr.c:214
++#: dirmngr/dirmngr.c:216
msgid "|URL|use OCSP responder at URL"
msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:218
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:224
msgid "|N|do not return more than N items in one query"
msgstr "|N|單次查詢不要傳回超過 N 筆項目"
- #: dirmngr/dirmngr.c:227
++#: dirmngr/dirmngr.c:229
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:231
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:254
++#: dirmngr/dirmngr.c:258
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9584,11 -7545,9 +9579,11 @@@ msgstr "
"@\n"
"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
- #: dirmngr/dirmngr.c:384
++#: dirmngr/dirmngr.c:392
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
- #: dirmngr/dirmngr.c:386
++#: dirmngr/dirmngr.c:394
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9596,77 -7555,60 +9591,77 @@@ msgstr "
"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
- #: dirmngr/dirmngr.c:466
++#: dirmngr/dirmngr.c:474
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有效的除錯等級為: %s\n"
- #: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
- #: tools/gpgconf.c:670
++#: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
++#: tools/gpgconf.c:671
#, c-format
msgid "usage: %s [options] "
msgstr "用法: %s [選項] "
- #: dirmngr/dirmngr.c:1151
++#: dirmngr/dirmngr.c:1197
msgid "colons are not allowed in the socket name\n"
msgstr "socket 名稱內不允許使用冒號\n"
- #: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
++#: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
++#: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1574
++#: dirmngr/dirmngr.c:1626
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 列太長 - 已跳過\n"
- #: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
++#: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 偵測到無效的指紋\n"
- #: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
++#: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4135
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 讀取錯誤: %s\n"
- #: dirmngr/dirmngr.c:1720
++#: dirmngr/dirmngr.c:1772
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 列尾的垃圾已忽略\n"
- #: dirmngr/dirmngr.c:1787
++#: dirmngr/dirmngr.c:1838
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
- #: dirmngr/dirmngr.c:1826
++#: dirmngr/dirmngr.c:1877
msgid "SIGUSR2 received - no action defined\n"
msgstr "收到 SIGUSR2 - 無定義行動\n"
- #: dirmngr/dirmngr.c:1831
++#: dirmngr/dirmngr.c:1882
msgid "SIGTERM received - shutting down ...\n"
msgstr "收到 SIGTERM - 正在關閉 ...\n"
- #: dirmngr/dirmngr.c:1833
++#: dirmngr/dirmngr.c:1884
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1889
msgid "shutdown forced\n"
msgstr "已強迫關閉\n"
- #: dirmngr/dirmngr.c:1846
++#: dirmngr/dirmngr.c:1897
msgid "SIGINT received - immediate shutdown\n"
msgstr "收到 SIGINT - 立即關閉\n"
- #: dirmngr/dirmngr.c:1853
++#: dirmngr/dirmngr.c:1904
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "收到訊號 %d - 無定義行動\n"
@@@ -9836,7 -7742,14 +9831,18 @@@ msgstr "'%s' 不是一個 LDAP 位址\n
msgid "'%s' is an invalid LDAP URL\n"
msgstr "'%s' 是無效的 LDAP 網址\n"
++#: dirmngr/http.c:1901 dirmngr/ocsp.c:242
+ #, c-format
+ msgid "error accessing '%s': http status %u\n"
+ msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
+
++#: 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"
+
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "印出日誌記錄列時出錯: %s\n"
@@@ -9901,12 -7802,10 +9907,12 @@@ msgstr "正在加入 '%s:%d' 至 ldap �
msgid "malloc failed: %s\n"
msgstr "動態記憶體配置失敗: %s\n"
- #: dirmngr/ldap.c:617
++#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: 無效的模式 '%s'\n"
- #: dirmngr/ldap.c:830
++#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search 達到伺服器的尺寸限制\n"
@@@ -9968,12 -7855,6 +9974,7 @@@ msgstr "連線至 '%s' 時出錯: %s\n
msgid "error reading HTTP response for '%s': %s\n"
msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
- #: dirmngr/ocsp.c:242
- #, c-format
- msgid "error accessing '%s': http status %u\n"
- msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
-
+#: dirmngr/ocsp.c:267
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
@@@ -10087,76 -7944,60 +10088,76 @@@ msgstr "OCSP 回應程式傳回非當�
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP 回應程式傳回老舊的狀態\n"
- #: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
++#: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) 失敗: %s\n"
- #: dirmngr/server.c:985
++#: dirmngr/server.c:994
msgid "ldapserver missing"
msgstr "遺失 ldapserver"
- #: dirmngr/server.c:1059
++#: dirmngr/server.c:1068
msgid "serialno missing in cert ID"
msgstr "憑證 ID 中遺失 serialno"
- #: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
- #: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
++#: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
++#: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire 失敗: %s\n"
- #: dirmngr/server.c:1324
++#: dirmngr/server.c:1333
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url 失敗: %s\n"
- #: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
++#: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
#, c-format
msgid "error sending data: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: dirmngr/server.c:1474
++#: dirmngr/server.c:1483
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch 失敗: %s\n"
- #: dirmngr/server.c:1507
++#: dirmngr/server.c:1516
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert 失敗: %s\n"
- #: dirmngr/server.c:1534
++#: dirmngr/server.c:1543
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d 已超出\n"
- #: dirmngr/server.c:2580
++#: dirmngr/server.c:2592
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "無法配置控制結構: %s\n"
- #: dirmngr/server.c:2591
++#: dirmngr/server.c:2603
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "配置 assuan 脈絡失敗: %s\n"
- #: dirmngr/server.c:2612
++#: dirmngr/server.c:2624
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "伺服器啟始失敗: %s\n"
- #: dirmngr/server.c:2620
++#: dirmngr/server.c:2632
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "向 Assuan 註冊指令時失敗: %s\n"
- #: dirmngr/server.c:2651
++#: dirmngr/server.c:2663
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan 接受問題: %s\n"
- #: dirmngr/server.c:2670
++#: dirmngr/server.c:2682
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan 處理時失敗: %s\n"
@@@ -10285,197 -8097,150 +10286,197 @@@ msgstr "送出列時失敗: %s\n
msgid "error sending standard options: %s\n"
msgstr "送出標準選項時出錯: %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
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
++#: tools/gpgconf-comp.c:780 tools/gpgconf-comp.c:879
msgid "Options controlling the diagnostic output"
msgstr "控制著診斷性輸出的選項"
- #: 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
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:793 tools/gpgconf-comp.c:902
msgid "Options controlling the configuration"
msgstr "控制著組態的選項"
- #: 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
++#: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:822 tools/gpgconf-comp.c:915
msgid "Options useful for debugging"
msgstr "對除錯有幫助的選項"
- #: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
++#: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:835
msgid "Options controlling the security"
msgstr "控制著安全性的選項"
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:536
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:540
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:544
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
- #: tools/gpgconf-comp.c:564
++#: tools/gpgconf-comp.c:568
msgid "Options enforcing a passphrase policy"
msgstr "強制執行密語原則的選項"
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:571
msgid "do not allow bypassing the passphrase policy"
msgstr "不允許略過密語原則"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:575
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|把新密語所需的最短長度設成 N"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:579
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|新密語至少要有 N 個非字母的字符"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:583
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:587
msgid "|N|expire the passphrase after N days"
msgstr "|N|在 N 天之後讓密語過期"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:591
msgid "do not allow the reuse of old passphrases"
msgstr "不允許重複使用舊密語"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:595
#, fuzzy
#| msgid "|N|set LDAP timeout to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|把 LDAP 逾時設成 N 秒"
- #: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
++#: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:795
msgid "|NAME|use NAME as default secret key"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
++#: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:798
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|名字|也加密給指定名字的使用者 ID"
- #: tools/gpgconf-comp.c:708
++#: tools/gpgconf-comp.c:712
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|設定電子郵件別名"
- #: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
++#: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:954
msgid "Configuration for Keyservers"
msgstr "金鑰伺服器組態"
- #: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
++#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:956
msgid "|URL|use keyserver at URL"
msgstr "|URL|使用位於 URL 的金鑰伺服器"
- #: tools/gpgconf-comp.c:749
++#: tools/gpgconf-comp.c:753
msgid "allow PKA lookups (DNS requests)"
msgstr "允許 PKA 查找 (DNS 請求)"
- #: tools/gpgconf-comp.c:752
++#: tools/gpgconf-comp.c:756
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
- #: tools/gpgconf-comp.c:803
++#: tools/gpgconf-comp.c:807
msgid "disable all access to the dirmngr"
msgstr "停用所有的 dirmngr 存取"
- #: tools/gpgconf-comp.c:806
++#: tools/gpgconf-comp.c:810
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
- #: tools/gpgconf-comp.c:839
++#: tools/gpgconf-comp.c:843
msgid "do not check CRLs for root certificates"
msgstr "不要為根憑證檢查 CRL"
- #: tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:892
msgid "Options controlling the format of the output"
msgstr "控制著輸出格式的選項"
- #: tools/gpgconf-comp.c:930
++#: tools/gpgconf-comp.c:934
msgid "Options controlling the interactivity and enforcement"
msgstr "控制著互動及強制執行的選項"
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:947
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "控制著安全性的選項"
- #: tools/gpgconf-comp.c:957
++#: tools/gpgconf-comp.c:961
msgid "Configuration for HTTP servers"
msgstr "HTTP 伺服器組態"
- #: tools/gpgconf-comp.c:968
++#: tools/gpgconf-comp.c:972
msgid "use system's HTTP proxy setting"
msgstr "使用系統的 HTTP 代理伺服器設定"
- #: tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:977
msgid "Configuration of LDAP servers to use"
msgstr "要用的 LDAP 伺服器組態"
- #: tools/gpgconf-comp.c:1002
++#: tools/gpgconf-comp.c:1006
msgid "LDAP server list"
msgstr "LDAP 伺服器清單"
- #: tools/gpgconf-comp.c:1010
++#: tools/gpgconf-comp.c:1014
msgid "Configuration for OCSP"
msgstr "OCSP 組態"
- #: tools/gpgconf-comp.c:1091
++#: tools/gpgconf-comp.c:1095
#, fuzzy
#| msgid "GPG for OpenPGP"
msgid "OpenPGP"
msgstr "OpenPGP 版 GPG"
- #: tools/gpgconf-comp.c:1092
++#: tools/gpgconf-comp.c:1096
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1093
++#: tools/gpgconf-comp.c:1097
#, fuzzy
#| msgid "Smartcard Daemon"
msgid "Smartcards"
msgstr "智慧卡服務"
- #: tools/gpgconf-comp.c:1094
++#: tools/gpgconf-comp.c:1098
#, fuzzy
#| msgid "GPG for S/MIME"
msgid "S/MIME"
msgstr "S/MIME 版 GPG"
- #: tools/gpgconf-comp.c:1095
++#: tools/gpgconf-comp.c:1099
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1096
++#: tools/gpgconf-comp.c:1100
#, fuzzy
#| msgid "PIN and Passphrase Entry"
msgid "Passphrase Entry"
msgstr "個人識別碼及密語項目"
- #: tools/gpgconf-comp.c:1287
++#: tools/gpgconf-comp.c:1291
msgid "Component not suitable for launching"
msgstr "元件不適合啟動"
- #: tools/gpgconf-comp.c:3410
++#: tools/gpgconf-comp.c:3414
#, c-format
msgid "External verification of component %s failed"
msgstr "元件 %s 的外部驗證失敗"
- #: tools/gpgconf-comp.c:3561
++#: tools/gpgconf-comp.c:3565
msgid "Note that group specifications are ignored\n"
msgstr "請注意群組規格已忽略\n"
- #: tools/gpgconf-comp.c:4135
++#: tools/gpgconf-comp.c:4139
#, fuzzy, c-format
#| msgid "error closing '%s': %s\n"
msgid "error closing '%s'\n"
msgstr "關閉 '%s' 時出錯: %s\n"
- #: tools/gpgconf-comp.c:4137
++#: tools/gpgconf-comp.c:4141
#, fuzzy, c-format
#| msgid "error hashing '%s': %s\n"
msgid "error parsing '%s'\n"
@@@ -10549,11 -8298,9 +10550,11 @@@ msgstr "當作輸出檔案來使用
msgid "activate changes at runtime, if possible"
msgstr "如果可能的話, 在執行期啟用變更"
- #: tools/gpgconf.c:127
++#: tools/gpgconf.c:128
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
- #: tools/gpgconf.c:130
++#: tools/gpgconf.c:131
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10561,15 -8308,12 +10562,15 @@@ msgstr "
"語法: @GPGCONF@ [選項]\n"
"管理 @GNUPG@ 系統工具的組態選項\n"
- #: tools/gpgconf.c:554 tools/gpgconf.c:589
++#: tools/gpgconf.c:555 tools/gpgconf.c:590
msgid "Need one component argument"
msgstr "需要一個元件引數"
- #: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
++#: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
msgid "Component not found"
msgstr "找不到元件"
- #: tools/gpgconf.c:672
++#: tools/gpgconf.c:673
msgid "No argument allowed"
msgstr "未允許使用引數"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list